raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #20660 from akka/wip-20659-leaking-tests-patriknw

Browse source 
fix memory leaks in tests, #20659
This commit is contained in:
Patrik Nordwall 2016-05-31 19:34:55 +02:00
commit f07041091f
38 changed files with 218 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java
View file

@ -3,6 +3,7 @@ package akka.event;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.testkit.JavaTestKit;
import akka.event.Logging.Error;
import akka.event.ActorWithMDC.Log;
@ -10,6 +11,8 @@ import static akka.event.Logging.*;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import scala.concurrent.duration.Duration;
@ -30,9 +33,19 @@ public class LoggingAdapterTest extends JUnitSuite {
"akka.actor.serialize-messages = off"
);
@Rule
public AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("LoggingAdapterTest", config);
private ActorSystem system = null;
@Before
public void beforeEach() {
system = actorSystemResource.getSystem();
}
@Test
public void mustFormatMessage() {
final ActorSystem system = ActorSystem.create("test-system", config);
final LoggingAdapter log = Logging.getLogger(system, this);
new LogJavaTestKit(system) {{
system.eventStream().subscribe(getRef(), LogEvent.class);
@ -66,7 +79,6 @@ public class LoggingAdapterTest extends JUnitSuite {
@Test
public void mustCallMdcForEveryLog() throws Exception {
final ActorSystem system = ActorSystem.create("test-system", config);
new LogJavaTestKit(system) {{
system.eventStream().subscribe(getRef(), LogEvent.class);
ActorRef ref = system.actorOf(Props.create(ActorWithMDC.class));
@ -86,7 +98,6 @@ public class LoggingAdapterTest extends JUnitSuite {
@Test
public void mustSupportMdcNull() throws Exception {
final ActorSystem system = ActorSystem.create("test-system", config);
new LogJavaTestKit(system) {{
system.eventStream().subscribe(getRef(), LogEvent.class);
ActorRef ref = system.actorOf(Props.create(ActorWithMDC.class));
@ -131,6 +142,7 @@ public class LoggingAdapterTest extends JUnitSuite {
void expectLog(final Object level, final String message, final Throwable cause, final String mdc) {
new ExpectMsg<Void>(Duration.create(3, TimeUnit.SECONDS), "LogEvent") {
@Override
protected Void match(Object event) {
LogEvent log = (LogEvent) event;
assertEquals(message, log.message());

11
akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala
View file

@ -360,11 +360,10 @@ class TcpConnectionSpec extends AkkaSpec("""
"respect pull mode" in new EstablishedConnectionTest(pullMode = true) {
// override config to decrease default buffer size
val config =
ConfigFactory.load(
ConfigFactory.parseString("akka.io.tcp.direct-buffer-size = 1k")
.withFallback(AkkaSpec.testConf))
override implicit def system: ActorSystem = ActorSystem("respectPullModeTest", config)
def config =
ConfigFactory.parseString("akka.io.tcp.direct-buffer-size = 1k")
.withFallback(AkkaSpec.testConf)
override implicit lazy val system: ActorSystem = ActorSystem("respectPullModeTest", config)
try run {
val maxBufferSize = 1 * 1024
@ -402,7 +401,7 @@ class TcpConnectionSpec extends AkkaSpec("""
connectionHandler.expectMsgType[Received].data.decodeString("ASCII") should ===(vs)
}
finally system.terminate()
finally shutdown(system)
}
"close the connection and reply with `Closed` upon reception of a `Close` command" in

24
akka-camel/src/test/java/akka/camel/CustomRouteTest.java
View file

@ -23,16 +23,21 @@ import java.util.concurrent.TimeUnit;
public class CustomRouteTest extends JUnitSuite {
@Rule
public AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("CustomRouteTest");
public AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("CustomRouteTest");
private final ActorSystem system = actorSystemResource.getSystem();
private Camel camel = (Camel) CamelExtension.get(system);
private ActorSystem system = null;
private Camel camel = null;
public static class MyActor extends UntypedActor {
@Override public void onReceive(Object o) {}
}
@Before
public void beforeEach() {
system = actorSystemResource.getSystem();
camel = (Camel) CamelExtension.get(system);
}
@Test
public void testCustomProducerRoute() throws Exception {
MockEndpoint mockEndpoint = camel.context().getEndpoint("mock:mockProducer", MockEndpoint.class);
@ -118,6 +123,7 @@ public class CustomRouteTest extends JUnitSuite {
private void assertMockEndpoint(MockEndpoint mockEndpoint) throws InterruptedException {
mockEndpoint.expectedMessageCount(1);
mockEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
return exchange.getIn().getBody().equals("test");
}
@ -126,8 +132,8 @@ public class CustomRouteTest extends JUnitSuite {
}
public static class CustomRouteBuilder extends RouteBuilder {
private String uri;
private String fromUri;
private final String uri;
private final String fromUri;
public CustomRouteBuilder(String from, String to) {
fromUri = from;
@ -164,7 +170,7 @@ public class CustomRouteTest extends JUnitSuite {
}
public static class EndpointProducer extends UntypedProducerActor {
private String uri;
private final String uri;
public EndpointProducer(String uri) {
this.uri = uri;
@ -192,8 +198,8 @@ public class CustomRouteTest extends JUnitSuite {
}
public static class TestAckConsumer extends UntypedConsumerActor {
private String myuri;
private String to;
private final String myuri;
private final String to;
public TestAckConsumer(String uri, String to){
myuri = uri;

4
akka-camel/src/test/scala/akka/camel/TestSupport.scala
View file

@ -48,7 +48,7 @@ private[camel] object TestSupport {
}
trait SharedCamelSystem extends BeforeAndAfterAll { this: Suite ⇒
implicit lazy val system = ActorSystem("test", AkkaSpec.testConf)
implicit lazy val system = ActorSystem("SharedCamelSystem", AkkaSpec.testConf)
implicit lazy val camel = CamelExtension(system)
abstract override protected def afterAll() {
@ -63,7 +63,7 @@ private[camel] object TestSupport {
override protected def beforeEach() {
super.beforeEach()
system = ActorSystem("test", AkkaSpec.testConf)
system = ActorSystem("NonSharedCamelSystem", AkkaSpec.testConf)
camel = CamelExtension(system)
}

2
akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala
View file

@ -7,7 +7,7 @@ import akka.actor.{ Props, ActorSystem }
import akka.testkit.{ TimingTest, TestProbe, TestKit }
import akka.camel.internal.ActivationProtocol._
class ActivationTrackerTest extends TestKit(ActorSystem("test")) with WordSpecLike with Matchers with BeforeAndAfterAll with BeforeAndAfterEach with GivenWhenThen {
class ActivationTrackerTest extends TestKit(ActorSystem("ActivationTrackerTest")) with WordSpecLike with Matchers with BeforeAndAfterAll with BeforeAndAfterEach with GivenWhenThen {
override protected def afterAll() { shutdown() }

2
akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
View file

@ -30,7 +30,7 @@ import akka.util.Timeout
import akka.actor._
import akka.testkit._
class ActorProducerTest extends TestKit(ActorSystem("test")) with WordSpecLike with Matchers with ActorProducerFixture {
class ActorProducerTest extends TestKit(ActorSystem("ActorProducerTest")) with WordSpecLike with Matchers with ActorProducerFixture {
implicit val timeout = Timeout(10 seconds)
"ActorProducer" when {

10
akka-contrib/src/test/scala/akka/contrib/pattern/AggregatorSpec.scala
View file

@ -7,13 +7,11 @@ import akka.testkit.{ ImplicitSender, TestKit }
import org.scalatest.FunSuiteLike
import org.scalatest.Matchers
import scala.annotation.tailrec
//#demo-code
import scala.collection._
import scala.concurrent.duration._
import scala.math.BigDecimal.int2bigDecimal
import akka.actor._
import org.scalatest.BeforeAndAfterAll
/**
* Sample and test code for the aggregator patter.
* This is based on Jamie Allen's tutorial at
@ -187,7 +185,11 @@ class ChainingSample extends Actor with Aggregator {
}
//#chain-sample
class AggregatorSpec extends TestKit(ActorSystem("test")) with ImplicitSender with FunSuiteLike with Matchers {
class AggregatorSpec extends TestKit(ActorSystem("AggregatorSpec")) with ImplicitSender with FunSuiteLike with Matchers with BeforeAndAfterAll {
override def afterAll(): Unit = {
shutdown()
}
test("Test request 1 account type") {
system.actorOf(Props[AccountBalanceRetriever]) ! GetCustomerAccountBalances(1, Set(Savings))

2
akka-docs/rst/java/code/docs/actor/FaultHandlingTest.java
View file

@ -151,7 +151,7 @@ public class FaultHandlingTest extends AbstractJavaTest {
@BeforeClass
public static void start() {
system = ActorSystem.create("test");
system = ActorSystem.create("FaultHandlingTest");
}
@AfterClass

6
akka-docs/rst/java/code/docs/actor/SchedulerDocTest.java
View file

@ -23,9 +23,9 @@ import org.junit.*;
public class SchedulerDocTest extends AbstractJavaTest {
@Rule
public AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("SchedulerDocTest", AkkaSpec.testConf());
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("SchedulerDocTest",
AkkaSpec.testConf());
private final ActorSystem system = actorSystemResource.getSystem();
private ActorRef testActor = system.actorOf(Props.create(MyUntypedActor.class));

15
akka-docs/rst/java/code/docs/camel/CustomRouteTestBase.java
View file

@ -11,11 +11,14 @@ public class CustomRouteTestBase {
public void customRoute() throws Exception{
//#CustomRoute
ActorSystem system = ActorSystem.create("some-system");
Camel camel = CamelExtension.get(system);
ActorRef responder = system.actorOf(Props.create(Responder.class), "TestResponder");
camel.context().addRoutes(new CustomRouteBuilder(responder));
//#CustomRoute
system.stop(responder);
JavaTestKit.shutdownActorSystem(system);
try {
Camel camel = CamelExtension.get(system);
ActorRef responder = system.actorOf(Props.create(Responder.class), "TestResponder");
camel.context().addRoutes(new CustomRouteBuilder(responder));
//#CustomRoute
system.stop(responder);
} finally {
JavaTestKit.shutdownActorSystem(system);
}
}
}

5
akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
View file

@ -131,6 +131,11 @@ public class SchedulerPatternTest extends AbstractJavaTest {
}};
}
@Test
public void doNothing() {
// actorSystemResource.after is not called when all tests are ignored
}
public static class TestSchedule extends JavaTestKit {
private ActorSystem system;

7
akka-docs/rst/scala/code/docs/io/ScalaUdpMulticastSpec.scala
View file

@ -6,16 +6,15 @@ package docs.io
import java.net.{ Inet6Address, InetSocketAddress, NetworkInterface, StandardProtocolFamily }
import java.nio.channels.DatagramChannel
import scala.util.Random
import akka.actor.{ ActorSystem, Props }
import akka.io.Udp
import akka.testkit.TestKit
import org.scalatest.{ BeforeAndAfter, WordSpecLike }
import scala.collection.JavaConversions.enumerationAsScalaIterator
import org.scalatest.BeforeAndAfterAll
class ScalaUdpMulticastSpec extends TestKit(ActorSystem("ScalaUdpMulticastSpec")) with WordSpecLike with BeforeAndAfter {
class ScalaUdpMulticastSpec extends TestKit(ActorSystem("ScalaUdpMulticastSpec")) with WordSpecLike with BeforeAndAfterAll {
"listener" should {
"send message back to sink" in {
@ -65,7 +64,7 @@ class ScalaUdpMulticastSpec extends TestKit(ActorSystem("ScalaUdpMulticastSpec")
}
}
def afterAll(): Unit = {
override def afterAll(): Unit = {
TestKit.shutdownActorSystem(system)
}

10
akka-docs/rst/scala/code/docs/testkit/ParentChildSpec.scala
View file

@ -11,6 +11,8 @@ import akka.testkit.ImplicitSender
import akka.testkit.TestProbe
import akka.testkit.TestActorRef
import akka.actor.ActorRefFactory
import akka.testkit.TestKit
import org.scalatest.BeforeAndAfterAll
/**
* Parent-Child examples
@ -74,8 +76,12 @@ class MockedChild extends Actor {
}
}
class ParentChildSpec extends WordSpec with Matchers with TestKitBase {
implicit lazy val system = ActorSystem()
class ParentChildSpec extends WordSpec with Matchers with TestKitBase with BeforeAndAfterAll {
implicit lazy val system = ActorSystem("ParentChildSpec")
override def afterAll(): Unit = {
TestKit.shutdownActorSystem(system)
}
"A DependentChild" should {
"be tested without its parent" in {

9
akka-http-core/src/test/scala/akka/http/scaladsl/ClientSpec.scala
View file

@ -10,11 +10,12 @@ import akka.http.scaladsl.model.HttpMethods._
import akka.stream.ActorMaterializer
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.{ Matchers, WordSpec }
import scala.concurrent.duration._
import scala.concurrent.{ Await }
import org.scalatest.BeforeAndAfterAll
import akka.testkit.TestKit
class ClientSpec extends WordSpec with Matchers {
class ClientSpec extends WordSpec with Matchers with BeforeAndAfterAll {
val testConf: Config = ConfigFactory.parseString("""
akka.loggers = ["akka.testkit.TestEventListener"]
akka.loglevel = ERROR
@ -25,6 +26,10 @@ class ClientSpec extends WordSpec with Matchers {
implicit val system = ActorSystem(getClass.getSimpleName, testConf)
implicit val materializer = ActorMaterializer()
override def afterAll(): Unit = {
TestKit.shutdownActorSystem(system)
}
"HTTP Client" should {
"reuse connection pool" in {

7
akka-http-core/src/test/scala/akka/http/scaladsl/TightRequestTimeoutSpec.scala
View file

@ -7,7 +7,6 @@ package akka.http.scaladsl
import java.io.{ BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter }
import java.net.{ BindException, Socket }
import java.util.concurrent.TimeoutException
import akka.actor.ActorSystem
import akka.event.Logging
import akka.event.Logging.LogEvent
@ -26,11 +25,11 @@ import akka.util.ByteString
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpec }
import scala.annotation.tailrec
import scala.concurrent.duration._
import scala.concurrent.{ Await, Future, Promise }
import scala.util.{ Success, Try }
import akka.testkit.TestKit
class TightRequestTimeoutSpec extends WordSpec with Matchers with BeforeAndAfterAll with ScalaFutures {
val testConf: Config = ConfigFactory.parseString("""
@ -46,6 +45,10 @@ class TightRequestTimeoutSpec extends WordSpec with Matchers with BeforeAndAfter
implicit val materializer = ActorMaterializer()
implicit val patience = PatienceConfig(3.seconds)
override def afterAll(): Unit = {
TestKit.shutdownActorSystem(system)
}
"Tight request timeout" should {
"not cause double push error caused by the late response attemting to push" in {

2
akka-stream-tests/src/test/java/akka/stream/StreamTest.java
View file

@ -7,7 +7,7 @@ package akka.stream;
import org.scalatest.junit.JUnitSuite;
import akka.actor.ActorSystem;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
public abstract class StreamTest extends JUnitSuite {
final protected ActorSystem system;

2
akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java
View file

@ -3,7 +3,7 @@ package akka.stream.actor;
import akka.actor.ActorRef;
import akka.actor.Props;
import akka.stream.StreamTest;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.stream.javadsl.Source;
import akka.testkit.AkkaSpec;
import akka.testkit.JavaTestKit;

2
akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java
View file

@ -3,7 +3,7 @@ package akka.stream.actor;
import akka.actor.ActorRef;
import akka.actor.Props;
import akka.stream.StreamTest;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.stream.javadsl.Sink;
import akka.stream.javadsl.Source;
import akka.testkit.AkkaSpec;

2
akka-stream-tests/src/test/java/akka/stream/io/InputStreamSinkTest.java
View file

@ -5,7 +5,7 @@ package akka.stream.io;
import akka.japi.Pair;
import akka.stream.StreamTest;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.stream.javadsl.Sink;
import akka.stream.javadsl.Source;
import akka.stream.javadsl.StreamConverters;

6
akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSinkTest.java
View file

@ -5,7 +5,7 @@ package akka.stream.io;
import akka.stream.IOResult;
import akka.stream.StreamTest;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.stream.javadsl.Source;
import akka.stream.javadsl.StreamConverters;
import akka.stream.testkit.Utils;
@ -29,7 +29,7 @@ public class OutputStreamSinkTest extends StreamTest {
}
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("OutputStreamSink",
public static AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("OutputStreamSinkTest",
Utils.UnboundedMailboxConfig());
@Test
public void mustSignalFailureViaIoResult() throws Exception {
@ -44,7 +44,7 @@ public class OutputStreamSinkTest extends StreamTest {
}
};
final CompletionStage<IOResult> resultFuture = Source.single(ByteString.fromString("123456")).runWith(StreamConverters.fromOutputStream(() -> os), materializer);
final IOResult result = resultFuture.toCompletableFuture().get(300, TimeUnit.MILLISECONDS);
final IOResult result = resultFuture.toCompletableFuture().get(3000, TimeUnit.MILLISECONDS);
assertFalse(result.wasSuccessful());
assertTrue(result.getError().getMessage().equals("Can't accept more data."));

8
akka-stream-tests/src/test/java/akka/stream/io/OutputStreamSourceTest.java
View file

@ -14,7 +14,7 @@ import org.junit.Test;
import akka.actor.ActorRef;
import akka.japi.function.Procedure;
import akka.stream.StreamTest;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.stream.javadsl.Sink;
import akka.stream.javadsl.Source;
import akka.stream.javadsl.StreamConverters;
@ -29,11 +29,11 @@ public class OutputStreamSourceTest extends StreamTest {
}
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("OutputStreamSource",
public static AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("OutputStreamSourceTest2",
Utils.UnboundedMailboxConfig());
@Test
public void mustSendEventsViaOutputStream() throws Exception {
final FiniteDuration timeout = FiniteDuration.create(300, TimeUnit.MILLISECONDS);
final FiniteDuration timeout = FiniteDuration.create(3000, TimeUnit.MILLISECONDS);
final JavaTestKit probe = new JavaTestKit(system);
final Source<ByteString, OutputStream> source = StreamConverters.asOutputStream(timeout);
@ -45,6 +45,8 @@ public class OutputStreamSourceTest extends StreamTest {
})).run(materializer);
s.write("a".getBytes());
assertEquals(ByteString.fromString("a"), probe.receiveOne(timeout));
s.close();

2
akka-stream-tests/src/test/java/akka/stream/io/SinkAsJavaSourceTest.java
View file

@ -5,7 +5,7 @@ package akka.stream.io;
import akka.stream.StreamTest;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.stream.javadsl.Sink;
import akka.stream.javadsl.Source;
import akka.stream.javadsl.StreamConverters;

84
akka-stream-tests/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java
View file

@ -1,84 +0,0 @@
/**
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.stream.javadsl;
import org.junit.rules.ExternalResource;
import akka.actor.ActorSystem;
import akka.testkit.AkkaSpec;
import akka.testkit.JavaTestKit;
import com.typesafe.config.Config;
// FIXME remove this copy, and use akka.testkit.AkkaJUnitActorSystemResource when
// akka-stream-experimental becomes a normal build project
/**
* This is a resource for creating an actor system before test start and shut it
* down afterwards.
*
* To use it on a class level add this to your test class:
*
* @ClassRule public static AkkaJUnitActorSystemResource actorSystemResource =
* new AkkaJUnitActorSystemResource(name, config);
*
* private final ActorSystem system =
* actorSystemResource.getSystem();
*
*
* To use it on a per test level add this to your test class:
*
* @Rule public AkkaJUnitActorSystemResource actorSystemResource = new
* AkkaJUnitActorSystemResource(name, config);
*
* private final ActorSystem system = actorSystemResource.getSystem();
*/
public class AkkaJUnitActorSystemResource extends ExternalResource {
private ActorSystem system = null;
private final String name;
private final Config config;
private ActorSystem createSystem(String name, Config config) {
try {
if (config == null)
return ActorSystem.create(name);
else
return ActorSystem.create(name, config);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
public AkkaJUnitActorSystemResource(String name, Config config) {
this.name = name;
this.config = config;
system = createSystem(name, config);
}
public AkkaJUnitActorSystemResource(String name) {
this(name, AkkaSpec.testConf());
}
@Override
protected void before() throws Throwable {
// Sometimes the ExternalResource seems to be reused, and
// we don't run the constructor again, so if that's the case
// then create the system here
if (system == null) {
system = createSystem(name, config);
}
}
@Override
protected void after() {
JavaTestKit.shutdownActorSystem(system);
system = null;
}
public ActorSystem getSystem() {
return system;
}
}

1
akka-stream-tests/src/test/java/akka/stream/javadsl/AttributesTest.java
View file

@ -14,6 +14,7 @@ import org.junit.Test;
import akka.stream.Attributes;
import akka.stream.StreamTest;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaSpec;
public class AttributesTest extends StreamTest {

1
akka-stream-tests/src/test/java/akka/stream/javadsl/BidiFlowTest.java
View file

@ -25,6 +25,7 @@ import akka.japi.function.*;
import akka.util.ByteString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertArrayEquals;
import akka.testkit.AkkaJUnitActorSystemResource;
public class BidiFlowTest extends StreamTest {
public BidiFlowTest() {

1
akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java
View file

@ -26,6 +26,7 @@ import scala.concurrent.Await;
import scala.concurrent.Future;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
import akka.testkit.AkkaJUnitActorSystemResource;
import java.util.*;
import java.util.concurrent.CompletableFuture;

1
akka-stream-tests/src/test/java/akka/stream/javadsl/FlowThrottleTest.java
View file

@ -16,6 +16,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
import akka.testkit.AkkaSpec;
import akka.testkit.AkkaJUnitActorSystemResource;
import static org.junit.Assert.assertEquals;

1
akka-stream-tests/src/test/java/akka/stream/javadsl/FramingTest.java
View file

@ -9,6 +9,7 @@ import akka.testkit.AkkaSpec;
import akka.util.ByteString;
import org.junit.ClassRule;
import org.junit.Test;
import akka.testkit.AkkaJUnitActorSystemResource;
public class FramingTest extends StreamTest {
public FramingTest() {

1
akka-stream-tests/src/test/java/akka/stream/javadsl/GraphDSLTest.java
View file

@ -14,6 +14,7 @@ import akka.japi.function.*;
import akka.testkit.AkkaSpec;
import akka.testkit.JavaTestKit;
import akka.testkit.TestProbe;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;

1
akka-stream-tests/src/test/java/akka/stream/javadsl/KillSwitchTest.java
View file

@ -11,6 +11,7 @@ import org.junit.Test;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
import akka.testkit.AkkaJUnitActorSystemResource;
import static org.junit.Assert.*;

1
akka-stream-tests/src/test/java/akka/stream/javadsl/SinkTest.java
View file

@ -24,6 +24,7 @@ import scala.concurrent.duration.Duration;
import akka.japi.function.Function2;
import akka.testkit.AkkaSpec;
import akka.testkit.JavaTestKit;
import akka.testkit.AkkaJUnitActorSystemResource;
import static org.junit.Assert.*;

1
akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java
View file

@ -28,6 +28,7 @@ import scala.concurrent.Future;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
import scala.util.Try;
import akka.testkit.AkkaJUnitActorSystemResource;
import java.util.*;
import java.util.concurrent.CompletableFuture;

1
akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java
View file

@ -29,6 +29,7 @@ import akka.testkit.AkkaSpec;
import akka.stream.testkit.TestUtils;
import akka.util.ByteString;
import akka.testkit.JavaTestKit;
import akka.testkit.AkkaJUnitActorSystemResource;
public class TcpTest extends StreamTest {
public TcpTest() {

2
akka-stream-tests/src/test/java/akka/stream/stage/StageTest.java
View file

@ -5,7 +5,7 @@ package akka.stream.stage;
import akka.NotUsed;
import akka.stream.StreamTest;
import akka.stream.javadsl.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.stream.javadsl.Sink;
import akka.stream.javadsl.Source;
import akka.testkit.AkkaSpec;

43
akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala
View file

@ -31,7 +31,7 @@ class OutputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) {
val settings = ActorMaterializerSettings(system).withDispatcher("akka.actor.default-dispatcher")
implicit val materializer = ActorMaterializer(settings)
val timeout = 300.milliseconds
val timeout = 3.seconds
val bytesArray = Array.fill[Byte](3)(Random.nextInt(1024).asInstanceOf[Byte])
val byteString = ByteString(bytesArray)
@ -41,6 +41,16 @@ class OutputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) {
def expectSuccess[T](f: Future[T], value: T) =
Await.result(f, remainingOrDefault) should be(value)
def assertNoBlockedThreads(): Unit = {
def threadsBlocked =
ManagementFactory.getThreadMXBean.dumpAllThreads(true, true).toSeq
.filter(t ⇒ t.getThreadName.startsWith("OutputStreamSourceSpec") &&
t.getLockName != null &&
t.getLockName.startsWith("java.util.concurrent.locks.AbstractQueuedSynchronizer"))
awaitAssert(threadsBlocked should ===(Seq()), 3.seconds)
}
"OutputStreamSource" must {
"read bytes from OutputStream" in assertAllStagesStopped {
val (outputStream, probe) = StreamConverters.asOutputStream().toMat(TestSink.probe[ByteString])(Keep.both).run
@ -156,11 +166,11 @@ class OutputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) {
.withAttributes(inputBuffer(0, 0))
.runWith(Sink.head)
/*
With Sink.head we test the code path in which the source
itself throws an exception when being materialized. If
Sink.ignore is used, the same exception is thrown by
Materializer.
*/
With Sink.head we test the code path in which the source
itself throws an exception when being materialized. If
Sink.ignore is used, the same exception is thrown by
Materializer.
*/
}
}
@ -175,13 +185,22 @@ class OutputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) {
sub.request(1)
sub.cancel()
def threadsBlocked =
ManagementFactory.getThreadMXBean.dumpAllThreads(true, true).toSeq
.filter(t ⇒ t.getThreadName.startsWith("OutputStreamSourceSpec") &&
t.getLockName != null &&
t.getLockName.startsWith("java.util.concurrent.locks.AbstractQueuedSynchronizer"))
assertNoBlockedThreads()
}
awaitAssert(threadsBlocked should ===(Seq()), 3.seconds)
"not leave blocked threads when materializer shutdown" in {
val materializer2 = ActorMaterializer(settings)
val (outputStream, probe) = StreamConverters.asOutputStream(timeout)
.toMat(TestSink.probe[ByteString])(Keep.both).run()(materializer2)
val sub = probe.expectSubscription()
// triggers a blocking read on the queue
// and then shutdown the materializer before we got anything
sub.request(1)
materializer2.shutdown()
assertNoBlockedThreads()
}
}
}

41
akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala
View file

@ -6,18 +6,21 @@ package akka.stream.impl.io
import java.io.{ IOException, OutputStream }
import java.util.concurrent.atomic.AtomicReference
import java.util.concurrent.{ BlockingQueue, LinkedBlockingQueue }
import akka.stream.{ Outlet, SourceShape, Attributes }
import akka.stream.Attributes.InputBuffer
import akka.stream.impl.Stages.DefaultAttributes
import akka.stream.impl.io.OutputStreamSourceStage._
import akka.stream.stage._
import akka.util.ByteString
import scala.concurrent.duration.FiniteDuration
import scala.concurrent.{ Await, Future, Promise }
import scala.util.control.NonFatal
import scala.util.{ Failure, Success, Try }
import akka.stream.ActorAttributes
import akka.stream.impl.Stages.DefaultAttributes.IODispatcher
import akka.stream.ActorAttributes.Dispatcher
import scala.concurrent.ExecutionContext
import akka.stream.ActorMaterializer
private[stream] object OutputStreamSourceStage {
sealed trait AdapterToStageMessage
@ -40,6 +43,9 @@ final private[stream] class OutputStreamSourceStage(writeTimeout: FiniteDuration
override def createLogicAndMaterializedValue(inheritedAttributes: Attributes): (GraphStageLogic, OutputStream) = {
val maxBuffer = inheritedAttributes.getAttribute(classOf[InputBuffer], InputBuffer(16, 16)).max
val dispatcherId = inheritedAttributes.get[Dispatcher](IODispatcher).dispatcher
require(maxBuffer > 0, "Buffer size must be greater than 0")
val dataQueue = new LinkedBlockingQueue[ByteString](maxBuffer)
@ -49,6 +55,9 @@ final private[stream] class OutputStreamSourceStage(writeTimeout: FiniteDuration
var flush: Option[Promise[Unit]] = None
var close: Option[Promise[Unit]] = None
private var dispatcher: ExecutionContext = null // set in preStart
private var blockingThread: Thread = null // for postStop interrupt
private val downstreamCallback: AsyncCallback[Try[ByteString]] =
getAsyncCallback {
case Success(elem) ⇒ onPush(elem)
@ -102,6 +111,11 @@ final private[stream] class OutputStreamSourceStage(writeTimeout: FiniteDuration
sendResponseIfNeed()
}
override def preStart(): Unit = {
dispatcher = ActorMaterializer.downcast(materializer).system.dispatchers.lookup(dispatcherId)
super.preStart()
}
setHandler(out, new OutHandler {
override def onDownstreamFinish(): Unit = {
//assuming there can be no further in messages
@ -112,10 +126,29 @@ final private[stream] class OutputStreamSourceStage(writeTimeout: FiniteDuration
completeStage()
}
override def onPull(): Unit = {
implicit val ex = interpreter.materializer.executionContext
Future(dataQueue.take()).onComplete(downstreamCallback.invoke)
implicit val ec = dispatcher
Future {
// keep track of the thread for postStop interrupt
blockingThread = Thread.currentThread()
try {
dataQueue.take()
} catch {
case _: InterruptedException ⇒
Thread.interrupted()
ByteString()
} finally {
blockingThread = null
}
}.onComplete(downstreamCallback.invoke)
}
})
override def postStop(): Unit = {
// interrupt any pending blocking take
if (blockingThread != null)
blockingThread.interrupt()
super.postStop()
}
}
(logic, new OutputStreamAdapter(dataQueue, downstreamStatus, logic.wakeUp, writeTimeout))
}

33
akka-testkit/src/test/java/akka/testkit/AkkaJUnitActorSystemResource.java
View file

@ -4,28 +4,44 @@
package akka.testkit;
import akka.actor.ActorSystem;
import com.typesafe.config.Config;
import org.junit.rules.ExternalResource;
/**
* This is a resource for creating an actor system before test start and shut it down afterwards.
* This is a resource for creating an actor system before test start and shut it
* down afterwards.
*
* To use it on a class level add this to your test class:
*
* @ClassRule
* <code>
* &#64;ClassRule
* public static AkkaJUnitActorSystemResource actorSystemResource =
* new AkkaJUnitActorSystemResource(name, config);
*
* private final ActorSystem system = actorSystemResource.getSystem();
* </code>
*
*
* To use it on a per test level add this to your test class:
* To use it on a per test level add this to your test class:
*
* @Rule
* <code>
* &#64;Rule
* public AkkaJUnitActorSystemResource actorSystemResource =
* new AkkaJUnitActorSystemResource(name, config);
*
* private final ActorSystem system = actorSystemResource.getSystem();
* private ActorSystem system = null;
*
* &#64;Before
* public void beforeEach() {
* system = actorSystemResource.getSystem();
* }
* </code>
*
* Note that it is important to not use <code>getSystem</code> from the
* constructor of the test, becuase some test runners may create an
* instance of the class without actually using it later, resulting in
* memory leaks because of not shutting down the actor system.
*/
public class AkkaJUnitActorSystemResource extends ExternalResource {
@ -49,7 +65,6 @@ public class AkkaJUnitActorSystemResource extends ExternalResource {
public AkkaJUnitActorSystemResource(String name, Config config) {
this.name = name;
this.config = config;
system = createSystem(name, config);
}
public AkkaJUnitActorSystemResource(String name) {
@ -58,9 +73,6 @@ public class AkkaJUnitActorSystemResource extends ExternalResource {
@Override
protected void before() throws Throwable {
// Sometimes the ExternalResource seems to be reused, and
// we don't run the constructor again, so if that's the case
// then create the system here
if (system == null) {
system = createSystem(name, config);
}
@ -73,6 +85,9 @@ public class AkkaJUnitActorSystemResource extends ExternalResource {
}
public ActorSystem getSystem() {
if (system == null) {
system = createSystem(name, config);
}
return system;
}
}

14
akka-typed/src/test/scala/akka/typed/TypedSpec.scala
View file

@ -25,13 +25,13 @@ import org.scalactic.Constraint
/**
* Helper class for writing tests for typed Actors with ScalaTest.
*/
class TypedSpec(config: Config) extends Spec with Matchers with BeforeAndAfterAll with ScalaFutures with ConversionCheckedTripleEquals {
abstract class TypedSpec(config: Config) extends Spec with Matchers with BeforeAndAfterAll with ScalaFutures with ConversionCheckedTripleEquals {
import TypedSpec._
import AskPattern._
def this() = this(ConfigFactory.empty)
implicit val system = ActorSystem(AkkaSpec.getCallerName(classOf[TypedSpec]), Props(guardian()), Some(config withFallback AkkaSpec.testConf))
implicit val system = ActorSystem(TypedSpec.getCallerName(classOf[TypedSpec]), Props(guardian()), Some(config withFallback AkkaSpec.testConf))
implicit val timeout = Timeout(1.minute)
implicit val patience = PatienceConfig(3.seconds)
@ -146,4 +146,14 @@ object TypedSpec {
c.replyTo ! ctx.spawn(c.props, c.name)
Same
}
def getCallerName(clazz: Class[_]): String = {
val s = (Thread.currentThread.getStackTrace map (_.getClassName) drop 1)
.dropWhile(_ matches "(java.lang.Thread|.*TypedSpec.?$)")
val reduced = s.lastIndexWhere(_ == clazz.getName) match {
case -1 ⇒ s
case z ⇒ s drop (z + 1)
}
reduced.head.replaceFirst(""".*\.""", "").replaceAll("[^a-zA-Z_0-9]", "_")
}
}