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

Wait on shutdown of extra actor systems in tests. See #3217

Browse source
This commit is contained in:
Björn Antonsson 2013-05-02 17:12:36 +02:00
parent 3bc661bed6
commit e00ab533bb
84 changed files with 762 additions and 845 deletions
Download patch file Download diff file Expand all files Collapse all files

20
akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
View file

@ -4,34 +4,26 @@
package akka.actor;
import akka.actor.ActorSystem;
import akka.event.Logging;
import akka.event.Logging.LoggerInitialized;
import akka.japi.Creator;
import akka.routing.CurrentRoutees;
import akka.routing.FromConfig;
import akka.routing.NoRouter;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaSpec;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import static org.junit.Assert.*;
public class JavaAPI {
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("JAvaAPI", AkkaSpec.testConf());
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("JavaAPI", AkkaSpec.testConf());
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
// compilation tests
@SuppressWarnings("unused")

27
akka-actor-tests/src/test/java/akka/actor/JavaExtension.java
View file

@ -3,14 +3,10 @@
*/
package akka.actor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.*;
import akka.testkit.AkkaSpec;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.Config;
import static org.junit.Assert.*;
@ -47,20 +43,13 @@ public class JavaExtension {
}
}
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("JavaExtension",
ConfigFactory.parseString("akka.extensions = [ \"akka.actor.JavaExtension$TestExtensionId\" ]")
.withFallback(AkkaSpec.testConf()));
@BeforeClass
public static void beforeAll() {
Config c = ConfigFactory.parseString("akka.extensions = [ \"akka.actor.JavaExtension$TestExtensionId\" ]")
.withFallback(AkkaSpec.testConf());
system = ActorSystem.create("JavaExtension", c);
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void mustBeAccessible() {

20
akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java
View file

@ -1,26 +1,18 @@
package akka.actor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import com.typesafe.config.ConfigFactory;
public class StashJavaAPI {
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("StashJavaAPI", ActorWithBoundedStashSpec.testConf());
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("StashJavaAPI",
ConfigFactory.parseString(ActorWithStashSpec.testConf()));
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void mustBeAbleToUseStash() {

24
akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
View file

@ -1,16 +1,14 @@
package akka.dispatch;
import akka.util.Timeout;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.actor.ActorSystem;
import akka.japi.*;
import org.junit.ClassRule;
import scala.concurrent.Await;
import scala.concurrent.Future;
import scala.concurrent.Promise;
import scala.concurrent.duration.Duration;
import akka.testkit.TestKitExtension;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
@ -26,23 +24,13 @@ import akka.testkit.AkkaSpec;
public class JavaFutureTests {
private static ActorSystem system;
private static Timeout t;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("JavaFutureTests", AkkaSpec.testConf());
private final ActorSystem system = actorSystemResource.getSystem();
private final Duration timeout = Duration.create(5, TimeUnit.SECONDS);
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("JavaFutureTests", AkkaSpec.testConf());
t = TestKitExtension.get(system).DefaultTimeout();
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
@Test
public void mustBeAbleToMapAFuture() throws Exception {

8
akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
View file

@ -147,7 +147,7 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend
}
"allow valid names" in {
ActorSystem("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-").shutdown()
shutdown(ActorSystem("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"))
}
"support extensions" in {
@ -199,14 +199,14 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend
val system = ActorSystem()
system.isTerminated must be(false)
system.shutdown()
system.awaitTermination()
system.awaitTermination(10 seconds)
system.isTerminated must be(true)
}
"throw RejectedExecutionException when shutdown" in {
val system2 = ActorSystem("AwaitTermination", AkkaSpec.testConf)
system2.shutdown()
system2.awaitTermination(5 seconds)
system2.awaitTermination(10 seconds)
intercept[RejectedExecutionException] {
system2.registerOnTermination { println("IF YOU SEE THIS THEN THERE'S A BUG HERE") }
@ -275,7 +275,7 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend
val t = probe.expectMsg(Terminated(a)(existenceConfirmed = true, addressTerminated = false))
t.existenceConfirmed must be(true)
t.addressTerminated must be(false)
system.shutdown()
shutdown(system)
}
"shut down when /user escalates" in {

2
akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala
View file

@ -132,7 +132,7 @@ class DeployerSpec extends AkkaSpec(DeployerSpec.deployerConf) {
}
""", ConfigParseOptions.defaults).withFallback(AkkaSpec.testConf)
ActorSystem("invalid", invalidDeployerConf).shutdown()
shutdown(ActorSystem("invalid", invalidDeployerConf))
}
}

2
akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala
View file

@ -295,7 +295,7 @@ class FSMActorSpec extends AkkaSpec(Map("akka.actor.debug.fsm" -> true)) with Im
}
}
} finally {
fsmEventSystem.shutdown()
TestKit.shutdownActorSystem(fsmEventSystem)
}
}

2
akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala
View file

@ -104,7 +104,7 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) {
expectMsgAllOf(m, Logging.Debug(sys.deadLetters.path.toString, sys.deadLetters.getClass, "unhandled message from " + sys.deadLetters + ": 42"))
sys.eventStream.unsubscribe(testActor)
} finally {
sys.shutdown()
shutdown(sys)
}
}

9
akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala
View file

@ -99,8 +99,7 @@ class LoggerSpec extends WordSpec with MustMatchers {
probe.expectNoMsg(0.5.seconds.dilated)
}
} finally {
system.shutdown()
system.awaitTermination(5.seconds.dilated)
TestKit.shutdownActorSystem(system)
}
}
out
@ -139,8 +138,7 @@ class LoggerSpec extends WordSpec with MustMatchers {
probe1.expectMsg("log it")
probe2.expectMsg("log it")
} finally {
system.shutdown()
system.awaitTermination(5.seconds.dilated)
TestKit.shutdownActorSystem(system)
}
}
}
@ -165,8 +163,7 @@ class LoggerSpec extends WordSpec with MustMatchers {
try {
SerializationExtension(s).serialize(Warning("foo", classOf[String]))
} finally {
s.shutdown()
s.awaitTermination(5.seconds.dilated)
TestKit.shutdownActorSystem(s)
}
}
}

6
akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
View file

@ -47,9 +47,9 @@ class LoggingReceiveSpec extends WordSpec with BeforeAndAfterEach with BeforeAnd
}
override def afterAll {
appLogging.shutdown()
appAuto.shutdown()
appLifecycle.shutdown()
TestKit.shutdownActorSystem(appLogging)
TestKit.shutdownActorSystem(appAuto)
TestKit.shutdownActorSystem(appLifecycle)
}
"A LoggingReceive" must {

2
akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
View file

@ -590,7 +590,7 @@ class RoutingSpec extends AkkaSpec(RoutingSpec.config) with DefaultTimeout with
try {
sys.actorOf(Props.empty.withRouter(FromConfig), "routed")
} finally {
sys.shutdown()
shutdown(sys)
}
}

2
akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
View file

@ -186,7 +186,7 @@ class SerializeSpec extends AkkaSpec(SerializationTests.serializeConf) {
(deadLetters eq a.deadLetters) must be(true)
}
} finally {
a.shutdown()
shutdown(a)
}
}

19
akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java
View file

@ -4,31 +4,28 @@
package akka.camel;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaSpec;
import org.junit.ClassRule;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.testkit.JavaTestKit;
import akka.util.Timeout;
import scala.concurrent.Await;
import scala.concurrent.ExecutionContext;
import org.junit.AfterClass;
import org.junit.Test;
import java.util.concurrent.TimeUnit;
import akka.testkit.AkkaSpec;
import static org.junit.Assert.*;
/**
*
*/
public class ConsumerJavaTestBase {
static ActorSystem system = ActorSystem.create("test", AkkaSpec.testConf());
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("ConsumerJavaTest", AkkaSpec.testConf());
@AfterClass
public static void tearDownAfterClass() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void shouldHandleExceptionThrownByActorAndGenerateCustomResponse() throws Exception {

25
akka-camel/src/test/java/akka/camel/CustomRouteTestBase.java
View file

@ -4,7 +4,9 @@ import akka.actor.*;
import akka.camel.internal.component.CamelPath;
import akka.camel.javaapi.UntypedConsumerActor;
import akka.camel.javaapi.UntypedProducerActor;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.util.Timeout;
import org.junit.*;
import scala.concurrent.Await;
import scala.concurrent.ExecutionContext;
import scala.concurrent.duration.Duration;
@ -14,25 +16,20 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
import org.junit.After;
import org.junit.Test;
import java.util.concurrent.TimeUnit;
public class CustomRouteTestBase {
private static Camel camel;
private static ActorSystem system;
@Before
public void before() {
system = ActorSystem.create("test");
camel = (Camel) CamelExtension.get(system);
}
@Rule
public AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("CustomRouteTest");
@After
public void after() {
system.shutdown();
private final ActorSystem system = actorSystemResource.getSystem();
private Camel camel = (Camel) CamelExtension.get(system);
public static class MyActor extends UntypedActor {
@Override public void onReceive(Object o) {}
}
@Test
@ -98,7 +95,7 @@ public class CustomRouteTestBase {
camel.activationFutureFor(system.actorOf(Props.create(TestAckConsumer.class, "direct:testConsumerAckFromUri","mock:mockAckUri"), "testConsumerAckUri"),
timeout, executionContext),
duration);
camel.context().addRoutes(new CustomRouteBuilder("direct:testAckFromUri","akka://test/user/testConsumerAckUri?autoAck=false"));
camel.context().addRoutes(new CustomRouteBuilder("direct:testAckFromUri","akka://CustomRouteTest/user/testConsumerAckUri?autoAck=false"));
camel.template().sendBody("direct:testAckFromUri", "test");
assertMockEndpoint(mockEndpoint);
system.stop(consumer);

21
akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java
View file

@ -6,11 +6,10 @@ package akka.camel;
import akka.actor.ActorSystem;
import akka.dispatch.Mapper;
import akka.japi.Function;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.converter.stream.InputStreamCache;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import java.io.InputStream;
@ -22,20 +21,14 @@ import static org.junit.Assert.assertEquals;
*
*/
public class MessageJavaTestBase {
static Camel camel;
private static ActorSystem system;
private Map<String,Object> empty = new HashMap<String, Object>();
@BeforeClass
public static void setUpBeforeClass() {
system = ActorSystem.create("test");
camel = (Camel) CamelExtension.get(system);
}
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("MessageJavaTest");
@AfterClass
public static void cleanup(){
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
private Camel camel = (Camel) CamelExtension.get(system);
CamelMessage message(Object body){ return new CamelMessage(body, new HashMap<String, Object>()); }
CamelMessage message(Object body, Map<String, Object> headers){ return new CamelMessage(body, headers); }

3
akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala
View file

@ -8,13 +8,14 @@ import org.scalatest.WordSpec
import akka.actor.ActorSystem
import scala.concurrent.duration.Duration
import java.util.concurrent.TimeUnit._
import akka.testkit.TestKit
class CamelConfigSpec extends WordSpec with MustMatchers {
val (settings, config) = {
val system = ActorSystem("CamelConfigSpec")
val result = (CamelExtension(system).settings, system.settings.config)
system.shutdown()
TestKit.shutdownActorSystem(system)
result
}
"CamelConfigSpec" must {

2
akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
View file

@ -31,7 +31,7 @@ class ProducerFeatureTest extends TestKit(ActorSystem("test", AkkaSpec.testConf)
override protected def afterAll() {
super.afterAll()
system.shutdown()
shutdown(system)
}
val camelContext = camel.context

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

@ -15,7 +15,7 @@ import scala.reflect.ClassTag
import akka.actor.{ ActorRef, Props, ActorSystem, Actor }
import scala.concurrent.Await
import akka.util.Timeout
import akka.testkit.AkkaSpec
import akka.testkit.{ TestKit, AkkaSpec }
private[camel] object TestSupport {
def start(actor: ⇒ Actor, name: String)(implicit system: ActorSystem, timeout: Timeout): ActorRef =
@ -53,7 +53,7 @@ private[camel] object TestSupport {
abstract override protected def afterAll() {
super.afterAll()
system.shutdown()
TestKit.shutdownActorSystem(system)
}
}
@ -68,7 +68,7 @@ private[camel] object TestSupport {
}
override protected def afterEach() {
system.shutdown()
TestKit.shutdownActorSystem(system)
super.afterEach()
}

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

@ -11,7 +11,7 @@ import akka.camel.internal.ActivationProtocol._
class ActivationTrackerTest extends TestKit(ActorSystem("test")) with WordSpec with MustMatchers with BeforeAndAfterAll with BeforeAndAfterEach with GivenWhenThen {
override protected def afterAll() { system.shutdown() }
override protected def afterAll() { shutdown(system) }
var actor: TestProbe = _
var awaiting: Awaiting = _

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

@ -379,7 +379,7 @@ private[camel] trait ActorProducerFixture extends MockitoSugar with BeforeAndAft
}
override protected def afterAll() {
system.shutdown()
shutdown(system)
}
def msg(s: String) = CamelMessage(s, Map.empty)

3
akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
View file

@ -251,8 +251,7 @@ abstract class ClusterDeathWatchSpec
endProbe.expectMsg(EndActor.EndAck)
} finally {
endSystem.shutdown()
endSystem.awaitTermination(10 seconds)
shutdown(endSystem, 10 seconds)
}
// no barrier here, because it is not part of testConductor roles any more

7
akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala
View file

@ -57,9 +57,9 @@ abstract class RestartFirstSeedNodeSpec
override def afterAll(): Unit = {
runOn(seed1) {
if (seed1System.isTerminated)
restartedSeed1System.shutdown()
shutdown(restartedSeed1System)
else
seed1System.shutdown()
shutdown(seed1System)
}
super.afterAll()
}
@ -103,8 +103,7 @@ abstract class RestartFirstSeedNodeSpec
// shutdown seed1System
runOn(seed1) {
seed1System.shutdown()
seed1System.awaitTermination(remaining)
shutdown(seed1System, remaining)
}
runOn(seed2, seed3) {
awaitMembersUp(2, canNotBePartOfMemberRing = Set(seedNodes.head))

4
akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
View file

@ -961,7 +961,7 @@ abstract class StressSpec
reportResult {
val nextAS =
if (activeRoles contains myself) {
previousAS foreach { _.shutdown() }
previousAS foreach { as ⇒ TestKit.shutdownActorSystem(as) }
val sys = ActorSystem(system.name, system.settings.config)
muteLog(sys)
Cluster(sys).joinSeedNodes(seedNodes.toIndexedSeq map address)
@ -990,7 +990,7 @@ abstract class StressSpec
}
}
loop(1, None, Set.empty) foreach { _.shutdown }
loop(1, None, Set.empty) foreach { as ⇒ TestKit.shutdownActorSystem(as) }
within(loopDuration) {
runOn(usedRoles: _*) {
awaitMembersUp(nbrUsedRoles, timeout = remaining)

3
akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala
View file

@ -185,8 +185,7 @@ abstract class UnreachableNodeJoinsAgainSpec
endProbe.expectMsg(EndActor.EndAck)
} finally {
freshSystem.shutdown()
freshSystem.awaitTermination(10 seconds)
shutdown(freshSystem)
}
// no barrier here, because it is not part of testConductor roles any more
}

17
akka-contrib/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java
View file

@ -4,8 +4,8 @@
package akka.contrib.pattern;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import akka.actor.ActorRef;
@ -17,17 +17,12 @@ import akka.event.LoggingAdapter;
public class DistributedPubSubMediatorTest {
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("DistributedPubSubMediatorTest");
@BeforeClass
public static void setup() {
system = ActorSystem.create();
}
private final ActorSystem system = actorSystemResource.getSystem();
@AfterClass
public static void teardown() {
system.shutdown();
}
@Test
public void demonstrateUsage() {

18
akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java
View file

@ -4,8 +4,8 @@
package akka.contrib.pattern;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import scala.concurrent.duration.Duration;
@ -25,17 +25,11 @@ import akka.contrib.pattern.ReliableProxy;
public class ReliableProxyTest {
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("ReliableProxyTest");
@BeforeClass
public static void setup() {
system = ActorSystem.create();
}
@AfterClass
public static void teardown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void demonstrateUsage() {

2
akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala
View file

@ -32,7 +32,7 @@ class TimerBasedThrottlerSpec extends TestKit(ActorSystem("TimerBasedThrottlerSp
with WordSpec with MustMatchers with BeforeAndAfterAll {
override def afterAll {
system.shutdown()
shutdown(system)
}
"A throttler" must {

3
akka-docs/rst/general/code/docs/config/ConfigDocSpec.scala
View file

@ -5,6 +5,7 @@ package docs.config
import org.scalatest.WordSpec
import org.scalatest.matchers.MustMatchers
import akka.testkit.TestKit
//#imports
import akka.actor.ActorSystem
@ -28,6 +29,6 @@ class ConfigDocSpec extends WordSpec with MustMatchers {
val system = ActorSystem("MySystem", ConfigFactory.load(customConf))
//#custom-config
system.shutdown()
TestKit.shutdownActorSystem(system)
}
}

3
akka-docs/rst/java/code/docs/actor/FSMDocTestBase.java
View file

@ -17,6 +17,7 @@ import akka.actor.UntypedActor;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.testkit.JavaTestKit;
import akka.testkit.TestProbe;
import akka.testkit.AkkaSpec;
@ -201,7 +202,7 @@ public class FSMDocTestBase {
@org.junit.After
public void cleanup() {
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

4
akka-docs/rst/java/code/docs/actor/FaultHandlingTestBase.java
View file

@ -26,6 +26,7 @@ import akka.testkit.TestProbe;
import akka.testkit.ErrorFilter;
import akka.testkit.EventFilter;
import akka.testkit.TestEvent;
import akka.testkit.JavaTestKit;
import static java.util.concurrent.TimeUnit.SECONDS;
import static akka.japi.Util.immutableSeq;
import akka.japi.Function;
@ -155,7 +156,8 @@ public class FaultHandlingTestBase {
@AfterClass
public static void cleanup() {
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
system = null;
}
@Test

19
akka-docs/rst/java/code/docs/actor/InboxDocTest.java
View file

@ -6,8 +6,8 @@ package docs.actor;
import java.util.concurrent.TimeUnit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import scala.concurrent.duration.Duration;
@ -21,18 +21,11 @@ import akka.testkit.JavaTestKit;
public class InboxDocTest {
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("InboxDocTest", AkkaSpec.testConf());
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("MySystem", AkkaSpec.testConf());
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void demonstrateInbox() {

28
akka-docs/rst/java/code/docs/actor/InitializationDocSpecJava.java
View file

@ -1,16 +1,16 @@
/**
* Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
*/
package docs.actor;
import akka.actor.*;
import akka.japi.Procedure;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.testkit.JavaTestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import scala.Option;
/**
* Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
*/
public class InitializationDocSpecJava {
static public class PreStartInitExample extends UntypedActor {
@ -62,17 +62,11 @@ public class InitializationDocSpecJava {
//#messageInit
}
static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("InitializationDocSpecJava");
@BeforeClass
public static void setup() {
system = ActorSystem.create("TestSystem");
}
@AfterClass
public static void teardown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void testIt() {
@ -88,9 +82,5 @@ public class InitializationDocSpecJava {
testactor.tell(probe, getRef());
expectMsgEquals("Up and running");
}};
}
}

23
akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java
View file

@ -17,26 +17,17 @@ import akka.actor.Cancellable;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.testkit.AkkaSpec;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.*;
public class SchedulerDocTestBase {
ActorSystem system;
ActorRef testActor;
@Rule
public AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("SchedulerDocTest", AkkaSpec.testConf());
@Before
public void setUp() {
system = ActorSystem.create("MySystem", AkkaSpec.testConf());
testActor = system.actorOf(Props.create(MyUntypedActor.class));
}
@After
public void tearDown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
private ActorRef testActor = system.actorOf(Props.create(MyUntypedActor.class));
@Test
public void scheduleOneOffTask() {

21
akka-docs/rst/java/code/docs/actor/UntypedActorDocTestBase.java
View file

@ -15,8 +15,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
//#import-gracefulStop
@ -82,18 +82,11 @@ import akka.util.Timeout;
public class UntypedActorDocTestBase {
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("UntypedActorDocTest", AkkaSpec.testConf());
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("MySystem", AkkaSpec.testConf());
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
@SuppressWarnings("unused")
@Test
@ -156,7 +149,7 @@ public class UntypedActorDocTestBase {
}
};
} finally {
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

18
akka-docs/rst/java/code/docs/actor/mailbox/DurableMailboxDocTestBase.java
View file

@ -9,8 +9,8 @@ import akka.actor.ActorRef;
//#imports
import org.junit.After;
import org.junit.Before;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import akka.testkit.AkkaSpec;
@ -20,18 +20,12 @@ import akka.actor.UntypedActor;
public class DurableMailboxDocTestBase {
ActorSystem system;
@Before
public void setUp() {
system = ActorSystem.create("MySystem",
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("DurableMailboxDocTest",
ConfigFactory.parseString(DurableMailboxDocSpec.config()).withFallback(AkkaSpec.testConf()));
}
@After
public void tearDown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void configDefinedDispatcher() {

3
akka-docs/rst/java/code/docs/agent/AgentDocTest.java
View file

@ -5,10 +5,7 @@ package docs.agent;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import akka.testkit.AkkaSpec;
import scala.concurrent.Await;
import scala.concurrent.duration.Duration;

4
akka-docs/rst/java/code/docs/camel/ActivationTestBase.java
View file

@ -6,6 +6,8 @@ package docs.camel;
import akka.camel.Camel;
import akka.camel.CamelExtension;
import akka.camel.javaapi.UntypedConsumerActor;
import akka.testkit.JavaTestKit;
import akka.testkit.TestKit;
import akka.util.Timeout;
import scala.concurrent.Future;
import scala.concurrent.duration.Duration;
@ -38,7 +40,7 @@ public class ActivationTestBase {
Future<ActorRef> deactivationFuture = camel.deactivationFutureFor(producer,
timeout, system.dispatcher());
//#CamelDeactivation
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
public static class MyConsumer extends UntypedConsumerActor {

5
akka-docs/rst/java/code/docs/camel/CamelExtensionTestBase.java
View file

@ -3,6 +3,7 @@ package docs.camel;
import akka.actor.ActorSystem;
import akka.camel.Camel;
import akka.camel.CamelExtension;
import akka.testkit.JavaTestKit;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.junit.Test;
@ -16,7 +17,7 @@ public class CamelExtensionTestBase {
CamelContext camelContext = camel.context();
ProducerTemplate producerTemplate = camel.template();
//#CamelExtension
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
public void addActiveMQComponent() {
//#CamelExtensionAddComponent
@ -26,7 +27,7 @@ public class CamelExtensionTestBase {
// camelContext.addComponent("activemq", ActiveMQComponent.activeMQComponent(
// "vm://localhost?broker.persistent=false"));
//#CamelExtensionAddComponent
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

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

@ -5,6 +5,7 @@ import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.camel.Camel;
import akka.camel.CamelExtension;
import akka.testkit.JavaTestKit;
public class CustomRouteTestBase {
public void customRoute() throws Exception{
@ -15,6 +16,6 @@ public class CustomRouteTestBase {
camel.context().addRoutes(new CustomRouteBuilder(responder));
//#CustomRoute
system.stop(responder);
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

3
akka-docs/rst/java/code/docs/camel/OnRouteResponseTestBase.java
View file

@ -1,6 +1,7 @@
package docs.camel;
import akka.actor.*;
import akka.testkit.JavaTestKit;
public class OnRouteResponseTestBase {
@ -17,6 +18,6 @@ public class OnRouteResponseTestBase {
//#RouteResponse
system.stop(receiver);
system.stop(forwardResponse);
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

7
akka-docs/rst/java/code/docs/camel/ProducerTestBase.java
View file

@ -3,6 +3,7 @@ package docs.camel;
import java.util.HashMap;
import java.util.Map;
import akka.testkit.JavaTestKit;
import scala.concurrent.Future;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
@ -18,7 +19,7 @@ public class ProducerTestBase {
ActorRef producer = system.actorOf(props, "jmsproducer");
producer.tell("<order amount=\"100\" currency=\"PLN\" itemId=\"12345\"/>", null);
//#TellProducer
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
@SuppressWarnings("unused")
@ -30,7 +31,7 @@ public class ProducerTestBase {
Future<Object> future = Patterns.ask(producer, "some request", 1000);
//#AskProducer
system.stop(producer);
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
public void correlate(){
@ -44,6 +45,6 @@ public class ProducerTestBase {
"itemId=\"12345\"/>",headers), null);
//#Correlate
system.stop(producer);
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

24
akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTestBase.java
View file

@ -16,7 +16,9 @@ import akka.event.LoggingAdapter;
//#imports-prio-mailbox
import akka.dispatch.PriorityGenerator;
import akka.dispatch.UnboundedPriorityMailbox;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.testkit.JavaTestKit;
import akka.testkit.TestKit;
import com.typesafe.config.Config;
//#imports-prio-mailbox
@ -35,8 +37,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
//#imports-required-mailbox
import docs.actor.MyBoundedUntypedActor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import scala.Option;
import scala.concurrent.ExecutionContext;
@ -48,20 +49,13 @@ import akka.testkit.AkkaSpec;
public class DispatcherDocTestBase {
static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("DispatcherDocTest", ConfigFactory.parseString(
DispatcherDocSpec.javaConfig()).withFallback(ConfigFactory.parseString(
DispatcherDocSpec.config())).withFallback(AkkaSpec.testConf()));
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("MySystem",
ConfigFactory.parseString(DispatcherDocSpec.javaConfig()).withFallback(
ConfigFactory.parseString(DispatcherDocSpec.config())).withFallback(AkkaSpec.testConf()));
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
@SuppressWarnings("unused")
@Test

8
akka-docs/rst/java/code/docs/event/LoggingDocTestBase.java
View file

@ -19,7 +19,7 @@ import akka.event.Logging.Debug;
//#imports-listener
import org.junit.Test;
import akka.testkit.JavaTestKit;
import scala.Option;
//#imports-deadletter
@ -37,7 +37,7 @@ public class LoggingDocTestBase {
ActorSystem system = ActorSystem.create("MySystem");
ActorRef myActor = system.actorOf(Props.create(MyActor.class, this));
myActor.tell("test", null);
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
@Test
@ -47,7 +47,7 @@ public class LoggingDocTestBase {
final ActorRef actor = system.actorOf(Props.create(DeadLetterActor.class));
system.eventStream().subscribe(actor, DeadLetter.class);
//#deadletters
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
@Test
@ -57,7 +57,7 @@ public class LoggingDocTestBase {
final Object[] args = new Object[] { "The", "brown", "fox", "jumps", 42 };
system.log().debug("five parameters: {}, {}, {}, {}, {}", args);
//#array
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
//#my-actor

18
akka-docs/rst/java/code/docs/future/FutureDocTestBase.java
View file

@ -51,8 +51,8 @@ import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.junit.After;
import org.junit.Before;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import akka.testkit.AkkaSpec;
@ -67,17 +67,11 @@ import static org.junit.Assert.*;
public class FutureDocTestBase {
ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("FutureDocTest", AkkaSpec.testConf());
@Before
public void setUp() {
system = ActorSystem.create("MySystem", AkkaSpec.testConf());
}
@After
public void tearDown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
public final static class PrintResult<T> extends OnSuccess<T> {
@Override public final void onSuccess(T t) {

17
akka-docs/rst/java/code/docs/io/UdpConnectedDocTest.java
View file

@ -4,8 +4,8 @@
package docs.io;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import akka.actor.ActorSystem;
@ -27,6 +27,7 @@ public class UdpConnectedDocTest {
static public class Demo extends UntypedActor {
ActorRef connectionActor = null;
ActorRef handler = getSelf();
ActorSystem system = context().system();
@Override
public void onReceive(Object msg) {
@ -78,18 +79,6 @@ public class UdpConnectedDocTest {
}
}
static ActorSystem system;
@BeforeClass
static public void setup() {
system = ActorSystem.create("UdpConnectedDocTest");
}
@AfterClass
static public void teardown() {
system.shutdown();
}
@Test
public void demonstrateConnect() {
}

18
akka-docs/rst/java/code/docs/io/UdpDocTest.java
View file

@ -19,13 +19,15 @@ import java.util.ArrayList;
import java.util.List;
//#imports
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
public class UdpDocTest {
static public class Demo extends UntypedActor {
ActorSystem system = context().system();
public void onReceive(Object message) {
//#manager
final ActorRef udp = Udp.get(system).manager();
@ -82,18 +84,6 @@ public class UdpDocTest {
}
}
static ActorSystem system;
@BeforeClass
static public void setup() {
system = ActorSystem.create("IODocTest");
}
@AfterClass
static public void teardown() {
system.shutdown();
}
@Test
public void demonstrateConnect() {
}

18
akka-docs/rst/java/code/docs/io/japi/IODocTest.java
View file

@ -5,8 +5,8 @@
package docs.io.japi;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
//#imports
@ -139,17 +139,11 @@ public class IODocTest {
}
//#client
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("IODocTest", AkkaSpec.testConf());
@BeforeClass
public static void setup() {
system = ActorSystem.create("IODocTest", AkkaSpec.testConf());
}
@AfterClass
public static void teardown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void testConnection() {

18
akka-docs/rst/java/code/docs/io/japi/PipelineTest.java
View file

@ -7,8 +7,8 @@ package docs.io.japi;
import java.nio.ByteOrder;
import java.util.concurrent.TimeUnit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import scala.concurrent.duration.Duration;
@ -49,17 +49,11 @@ public class PipelineTest {
final Context ctx = new Context();
//#byteorder
static ActorSystem system = null;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("PipelineTest");
@BeforeClass
public static void setup() {
system = ActorSystem.create("PipelineTest");
}
@AfterClass
public static void teardown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void demonstratePipeline() throws Exception {

18
akka-docs/rst/java/code/docs/io/japi/SslDocTest.java
View file

@ -9,8 +9,8 @@ import java.net.InetSocketAddress;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import akka.actor.ActorContext;
@ -184,17 +184,11 @@ public class SslDocTest {
}
//#server
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("SslDocTest", AkkaSpec.testConf());
@BeforeClass
public static void setup() {
system = ActorSystem.create("IODocTest", AkkaSpec.testConf());
}
@AfterClass
public static void teardown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void demonstrateSslClient() {

18
akka-docs/rst/java/code/docs/jrouting/ConsistentHashingRouterDocTestBase.java
View file

@ -3,8 +3,8 @@
*/
package docs.jrouting;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import akka.testkit.JavaTestKit;
import akka.actor.ActorSystem;
@ -27,17 +27,11 @@ import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope;
public class ConsistentHashingRouterDocTestBase {
static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("ConsistentHashingRouterDocTest");
@BeforeClass
public static void setup() {
system = ActorSystem.create();
}
@AfterClass
public static void teardown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
static
//#cache-actor

19
akka-docs/rst/java/code/docs/jrouting/CustomRouterDocTestBase.java
View file

@ -14,9 +14,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.*;
import scala.concurrent.Await;
import scala.concurrent.Future;
@ -38,17 +37,11 @@ import akka.util.Timeout;
public class CustomRouterDocTestBase {
ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("CustomRouterDocTest", AkkaSpec.testConf());
@Before
public void setUp() {
system = ActorSystem.create("MySystem", AkkaSpec.testConf());
}
@After
public void tearDown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
public static class MyActor extends UntypedActor {
@Override public void onReceive(Object o) {}

18
akka-docs/rst/java/code/docs/jrouting/RouterViaProgramDocTestBase.java
View file

@ -5,8 +5,8 @@ package docs.jrouting;
import java.util.Arrays;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import akka.actor.ActorRef;
@ -23,17 +23,11 @@ import docs.routing.RouterViaProgramDocSpec.Echo;
public class RouterViaProgramDocTestBase {
static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("RouterViaProgramDocTest");
@BeforeClass
public static void setup() {
system = ActorSystem.create();
}
@AfterClass
public static void teardown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
private static class JavaTestKitWithSelf extends JavaTestKit {
public JavaTestKitWithSelf(ActorSystem system) {

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

@ -16,17 +16,11 @@ import java.util.concurrent.TimeUnit;
public class SchedulerPatternTest {
static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("SchedulerPatternTest", AkkaSpec.testConf());
@BeforeClass
public static void setUp() {
system = ActorSystem.create("SchedulerPatternTest", AkkaSpec.testConf());
}
@AfterClass
public static void tearDown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
static
//#schedule-constructor

18
akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
View file

@ -3,8 +3,8 @@
*/
package docs.remoting;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.AkkaJUnitActorSystemResource;
import org.junit.ClassRule;
import org.junit.Test;
import com.typesafe.config.ConfigFactory;
@ -29,17 +29,11 @@ public class RemoteDeploymentDocTestBase {
}
}
static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("RemoteDeploymentDocTest");
@BeforeClass
public static void init() {
system = ActorSystem.create();
}
@AfterClass
public static void cleanup() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@Test
public void demonstrateDeployment() {

5
akka-docs/rst/java/code/docs/serialization/SerializationDocTestBase.java
View file

@ -3,6 +3,7 @@
*/
package docs.serialization;
import akka.testkit.JavaTestKit;
import org.junit.Test;
import static org.junit.Assert.*;
//#imports
@ -66,7 +67,7 @@ public class SerializationDocTestBase {
final ActorRef deserializedActorRef = extendedSystem.provider().resolveActorRef(identifier);
// Then just use the ActorRef
//#actorref-serializer
extendedSystem.shutdown();
JavaTestKit.shutdownActorSystem(extendedSystem);
}
static
@ -187,6 +188,6 @@ public class SerializationDocTestBase {
assertEquals(original, back);
//#programmatic
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

38
akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
View file

@ -5,12 +5,12 @@ package docs.testkit;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import akka.testkit.*;
import docs.actor.mailbox.DurableMailboxDocSpec;
import org.junit.ClassRule;
import org.junit.Test;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.Config;
import akka.actor.ActorKilledException;
import akka.actor.ActorRef;
@ -22,15 +22,18 @@ import akka.actor.Terminated;
import akka.actor.UntypedActor;
import scala.concurrent.Await;
import scala.concurrent.Future;
import akka.testkit.CallingThreadDispatcher;
import akka.testkit.TestActor;
import akka.testkit.TestActor.AutoPilot;
import akka.testkit.TestActorRef;
import akka.testkit.JavaTestKit;
import scala.concurrent.duration.Duration;
public class TestKitDocTest {
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("TestKitDocTest",
ConfigFactory.parseString("akka.loggers = [akka.testkit.TestEventListener]"));
private final ActorSystem system = actorSystemResource.getSystem();
//#test-actor-ref
static class MyActor extends UntypedActor {
public void onReceive(Object o) throws Exception {
@ -43,23 +46,6 @@ public class TestKitDocTest {
public boolean testMe() { return true; }
}
//#test-actor-ref
private static ActorSystem system;
@BeforeClass
public static void setup() {
final Config config = ConfigFactory.parseString(
"akka.loggers = [akka.testkit.TestEventListener]");
system = ActorSystem.create("demoSystem", config);
}
@AfterClass
public static void cleanup() {
system.shutdown();
}
//#test-actor-ref
@Test
public void demonstrateTestActorRef() {
final Props props = Props.create(MyActor.class);
@ -415,7 +401,7 @@ public class TestKitDocTest {
public void demonstrateEventFilter() {
//#test-event-filter
new JavaTestKit(system) {{
assertEquals("demoSystem", system.name());
assertEquals("TestKitDocTest", system.name());
final ActorRef victim = system.actorOf(Props.empty(), "victim");
final int result = new EventFilter<Integer>(ActorKilledException.class) {
@ -423,7 +409,7 @@ public class TestKitDocTest {
victim.tell(Kill.getInstance(), null);
return 42;
}
}.from("akka://demoSystem/user/victim").occurrences(1).exec();
}.from("akka://TestKitDocTest/user/victim").occurrences(1).exec();
assertEquals(42, result);
}};

3
akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java
View file

@ -43,7 +43,8 @@ public class TestKitSampleTest {
@AfterClass
public static void teardown() {
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
system = null;
}
@Test

10
akka-docs/rst/java/code/docs/transactor/TransactorDocTest.java
View file

@ -5,6 +5,8 @@
package docs.transactor;
import static org.junit.Assert.*;
import akka.testkit.JavaTestKit;
import org.junit.Test;
//#imports
@ -36,7 +38,7 @@ public class TransactorDocTest {
assertEquals(count, new Integer(1));
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
@Test
@ -59,7 +61,7 @@ public class TransactorDocTest {
coordinated.await();
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
@Test
@ -75,7 +77,7 @@ public class TransactorDocTest {
Integer count = (Integer) Await.result(ask(counter, "GetCount", timeout), timeout.duration());
assertEquals(count, new Integer(1));
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
@Test
@ -95,6 +97,6 @@ public class TransactorDocTest {
Integer count2 = (Integer) Await.result(ask(friend, "GetCount", timeout), timeout.duration());
assertEquals(count2, new Integer(1));
system.shutdown();
JavaTestKit.shutdownActorSystem(system);
}
}

21
akka-docs/rst/java/code/docs/zeromq/ZeromqDocTestBase.java
View file

@ -30,6 +30,7 @@ import akka.actor.UntypedActor;
import akka.actor.Props;
import akka.event.Logging;
import akka.event.LoggingAdapter;
import org.junit.*;
import scala.concurrent.duration.Duration;
import akka.serialization.SerializationExtension;
import akka.serialization.Serialization;
@ -47,26 +48,16 @@ import java.text.SimpleDateFormat;
import akka.actor.ActorSystem;
import akka.testkit.AkkaSpec;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.Assume;
import akka.testkit.AkkaJUnitActorSystemResource;
public class ZeromqDocTestBase {
ActorSystem system;
@Before
public void setUp() {
system = ActorSystem.create("ZeromqDocTest",
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("ZeromqDocTest",
ConfigFactory.parseString("akka.loglevel=INFO").withFallback(AkkaSpec.testConf()));
}
@After
public void tearDown() {
system.shutdown();
}
private final ActorSystem system = actorSystemResource.getSystem();
@SuppressWarnings("unused")
@Test

2
akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
View file

@ -267,7 +267,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
val system = ActorSystem("mySystem")
val myActor = system.actorOf(Props[MyActor].withDispatcher("my-dispatcher"), "myactor2")
//#system-actorOf
system.shutdown()
shutdown(system)
}
"creating actor with IndirectActorProducer" in {

2
akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
View file

@ -28,7 +28,7 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
val other = ActorSystem("remote", system.settings.config)
val address = other.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address("akka.tcp", "s", "host", 1)).get
override def afterTermination() { other.shutdown() }
override def afterTermination() { shutdown(other) }
"demonstrate programmatic deployment" in {
//#deploy

10
akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala
View file

@ -64,7 +64,7 @@ package docs.serialization {
//#serialize-messages-config
val a = ActorSystem("system", config)
a.settings.SerializeAllMessages must be(true)
a.shutdown()
shutdown(a)
}
"demonstrate configuration of serialize creators" in {
@ -79,7 +79,7 @@ package docs.serialization {
//#serialize-creators-config
val a = ActorSystem("system", config)
a.settings.SerializeAllCreators must be(true)
a.shutdown()
shutdown(a)
}
"demonstrate configuration of serializers" in {
@ -97,7 +97,7 @@ package docs.serialization {
""")
//#serialize-serializers-config
val a = ActorSystem("system", config)
a.shutdown()
shutdown(a)
}
"demonstrate configuration of serialization-bindings" in {
@ -126,7 +126,7 @@ package docs.serialization {
SerializationExtension(a).serializerFor(classOf[String]).getClass must equal(classOf[JavaSerializer])
SerializationExtension(a).serializerFor(classOf[Customer]).getClass must equal(classOf[JavaSerializer])
SerializationExtension(a).serializerFor(classOf[java.lang.Boolean]).getClass must equal(classOf[MyOwnSerializer])
a.shutdown()
shutdown(a)
}
"demonstrate the programmatic API" in {
@ -152,7 +152,7 @@ package docs.serialization {
back must equal(original)
//#programmatic
system.shutdown()
shutdown(system)
}
"demonstrate serialization of ActorRefs" in {

2
akka-docs/rst/scala/code/docs/testkit/PlainWordSpec.scala
View file

@ -31,7 +31,7 @@ class MySpec(_system: ActorSystem) extends TestKit(_system) with ImplicitSender
import MySpec._
override def afterAll {
system.shutdown()
TestKit.shutdownActorSystem(system)
}
"An Echo actor" must {

2
akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala
View file

@ -45,7 +45,7 @@ class TestKitUsageSpec
system.actorOf(Props(classOf[SequencingActor], testActor, headList, tailList))
override def afterAll {
system.shutdown()
shutdown(system)
}
"An EchoActor" should {

4
akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala
View file

@ -264,7 +264,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
actor ! Kill
}
} finally {
system.shutdown()
shutdown(system)
}
//#event-filter
}
@ -282,7 +282,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
try expectMsg("hello") catch { case NonFatal(e) ⇒ system.shutdown(); throw e }
//#put-your-test-code-here
system.shutdown()
shutdown(system)
}
//#test-kit-base
}

8
akka-docs/rst/scala/code/docs/transactor/TransactorDocSpec.scala
View file

@ -161,7 +161,7 @@ class TransactorDocSpec extends AkkaSpec {
count must be === 1
system.shutdown()
shutdown(system)
}
"coordinated api" in {
@ -191,7 +191,7 @@ class TransactorDocSpec extends AkkaSpec {
coordinated.await()
system.shutdown()
shutdown(system)
}
"counter transactor" in {
@ -208,7 +208,7 @@ class TransactorDocSpec extends AkkaSpec {
underlyingCounter.count.single.get must be === 1
system.shutdown()
shutdown(system)
}
"friendly counter transactor" in {
@ -229,6 +229,6 @@ class TransactorDocSpec extends AkkaSpec {
underlyingFriendlyCounter.count.single.get must be === 1
underlyingFriend.count.single.get must be === 1
system.shutdown()
shutdown(system)
}
}

2
akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
View file

@ -80,7 +80,7 @@ abstract class DurableMailboxSpec(system: ActorSystem, val backendName: String)
protected def atStartup() {}
final override def afterAll {
system.shutdown()
TestKit.shutdownActorSystem(system)
try system.awaitTermination(5 seconds) catch {
case _: TimeoutException ⇒ system.log.warning("Failed to stop [{}] within 5 seconds", system.name)
}

9
akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
View file

@ -268,14 +268,7 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles:
}
}
}
system.shutdown()
try system.awaitTermination(shutdownTimeout) catch {
case _: TimeoutException ⇒
val msg = "Failed to stop [%s] within [%s] \n%s".format(system.name, shutdownTimeout,
system.asInstanceOf[ActorSystemImpl].printTree)
if (verifySystemShutdown) throw new RuntimeException(msg)
else system.log.warning(msg)
}
shutdown(system)
afterTermination()
}

2
akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
View file

@ -34,7 +34,7 @@ akka {
}
override def afterTermination() {
other.shutdown()
shutdown(other)
}
"receive Terminated when watched node is unknown host" in {

2
akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
View file

@ -71,7 +71,7 @@ akka.actor.deployment {
val otherSystem = ActorSystem("remote-sys", conf)
override def afterTermination() {
otherSystem.shutdown()
shutdown(otherSystem)
}
"A Remote Router" must {

2
akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala
View file

@ -96,7 +96,7 @@ class RemoteWatcherSpec extends AkkaSpec(
akka.remote.transport.ActorTransportAdapter.DisassociateUnderlying.getClass)(_))
override def afterTermination() {
remoteSystem.shutdown()
shutdown(remoteSystem)
}
val heartbeatMsgB = Heartbeat(remoteAddressUid)

8
akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
View file

@ -201,7 +201,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
val maxPayloadBytes = system.settings.config.getBytes("akka.remote.test.maximum-payload-bytes").toInt
override def afterTermination() {
remoteSystem.shutdown()
shutdown(remoteSystem)
AssociationRegistry.clear()
}
@ -258,8 +258,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
// then we shutdown all but one system to simulate broken connections
moreSystems foreach { sys ⇒
sys.shutdown()
sys.awaitTermination(5.seconds.dilated)
shutdown(sys)
}
1 to n foreach { x ⇒
@ -531,8 +530,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
expectMsg(3.seconds, ("pong", otherGuyRemoteTest))
}(otherSystem)
} finally {
otherSystem.shutdown()
otherSystem.awaitTermination(5.seconds.dilated)
shutdown(otherSystem)
}
}
}

3
akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
View file

@ -129,8 +129,7 @@ abstract class Ticket1978CommunicationSpec(val cipherConfig: CipherConfig) exten
override def afterTermination() {
if (cipherConfig.runTest) {
other.shutdown()
other.awaitTermination()
shutdown(other)
}
}

2
akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
View file

@ -38,7 +38,7 @@ akka.loglevel = DEBUG
val target2 = other.actorFor(RootActorPath(addr) / testActor.path.elements)
override def afterTermination() {
other.shutdown()
shutdown(other)
}
// need to enable debug log-level without actually printing those messages

2
akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
View file

@ -103,6 +103,6 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with
EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
}
override def afterTermination(): Unit = systemB.shutdown()
override def afterTermination(): Unit = shutdown(systemB)
}

2
akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala
View file

@ -136,7 +136,7 @@ abstract class SystemMessageDeliveryStressTest(msg: String, cfg: String)
EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
}
override def afterTermination(): Unit = systemB.shutdown()
override def afterTermination(): Unit = shutdown(systemB)
}

2
akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
View file

@ -136,7 +136,7 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende
EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
}
override def afterTermination(): Unit = systemB.shutdown()
override def afterTermination(): Unit = shutdown(systemB)
}
class ThrottlerTransportAdapterGenericSpec extends GenericTransportSpec(withAkkaProtocol = true) {

50
akka-testkit/src/main/java/akka/testkit/JavaTestKit.java
View file

@ -4,7 +4,6 @@
package akka.testkit;
import akka.actor.Terminated;
import akka.japi.Option;
import scala.runtime.AbstractFunction0;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
@ -15,6 +14,8 @@ import akka.japi.Util;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
import java.util.concurrent.TimeUnit;
/**
* Java API: Test kit for testing actors. Inheriting from this class enables
* reception of replies from actors, which are queued by an internal actor and
@ -42,6 +43,29 @@ import scala.concurrent.duration.FiniteDuration;
*
*/
public class JavaTestKit {
/**
* Shut down an actor system and wait for termination.
* On failure debug output will be logged about the remaining actors in the system.
* <p>
*
* If verifySystemShutdown is true, then an exception will be thrown on failure.
*/
public static void shutdownActorSystem(ActorSystem actorSystem, Duration duration, Boolean verifySystemShutdown) {
boolean vss = verifySystemShutdown != null ? verifySystemShutdown : false;
Duration dur = duration != null ? duration : FiniteDuration.create(10, TimeUnit.SECONDS);
TestKit.shutdownActorSystem(actorSystem, dur, vss);
}
public static void shutdownActorSystem(ActorSystem actorSystem) {
shutdownActorSystem(actorSystem, null, null);
}
public void shutdownActorSystem(ActorSystem actorSystem, Duration duration) {
shutdownActorSystem(actorSystem, duration, null);
}
public void shutdownActorSystem(ActorSystem actorSystem, Boolean verifySystemShutdown) {
shutdownActorSystem(actorSystem, null, verifySystemShutdown);
}
private final TestProbe p;
public JavaTestKit(ActorSystem system) {
@ -637,4 +661,28 @@ public class JavaTestKit {
}
}
/**
* Shut down an actor system and wait for termination.
* On failure debug output will be logged about the remaining actors in the system.
* <p>
*
* If verifySystemShutdown is true, then an exception will be thrown on failure.
*/
public void shutdown(ActorSystem actorSystem, Duration duration, Boolean verifySystemShutdown) {
boolean vss = verifySystemShutdown != null ? verifySystemShutdown : false;
Duration dur = duration != null ? duration :
TestKit.dilated(FiniteDuration.create(5, TimeUnit.SECONDS),
getSystem()).min(FiniteDuration.create(10, TimeUnit.SECONDS));
JavaTestKit.shutdownActorSystem(actorSystem, dur, vss);
}
public void shutdown(ActorSystem actorSystem) {
shutdown(actorSystem, null, null);
}
public void shutdown(ActorSystem actorSystem, Duration duration) {
shutdown(actorSystem, duration, null);
}
public void shutdown(ActorSystem actorSystem, Boolean verifySystemShutdown) {
shutdown(actorSystem, null, verifySystemShutdown);
}
}

38
akka-testkit/src/main/scala/akka/testkit/TestKit.scala
View file

@ -8,12 +8,17 @@ import scala.annotation.{ varargs, tailrec }
import scala.collection.immutable
import scala.concurrent.duration._
import scala.reflect.ClassTag
import java.util.concurrent.{ BlockingDeque, LinkedBlockingDeque, TimeUnit, atomic }
import java.util.concurrent._
import java.util.concurrent.atomic.AtomicInteger
import akka.actor._
import akka.actor.Actor._
import akka.util.{ Timeout, BoxedType }
import scala.util.control.NonFatal
import scala.Some
import java.util.concurrent.TimeUnit
import akka.actor.IllegalActorStateException
import akka.actor.DeadLetter
import akka.actor.Terminated
object TestActor {
type Ignore = Option[PartialFunction[Any, Boolean]]
@ -645,6 +650,18 @@ trait TestKitBase {
}
}
/**
* Shut down an actor system and wait for termination.
* On failure debug output will be logged about the remaining actors in the system.
*
* If verifySystemShutdown is true, then an exception will be thrown on failure.
*/
def shutdown(actorSystem: ActorSystem,
duration: Duration = 5.seconds.dilated.min(10.seconds),
verifySystemShutdown: Boolean = false) {
TestKit.shutdownActorSystem(actorSystem, duration, verifySystemShutdown)
}
private def format(u: TimeUnit, d: Duration) = "%.3f %s".format(d.toUnit(u), u.toString.toLowerCase)
}
@ -727,6 +744,25 @@ object TestKit {
*/
def dilated(duration: Duration, system: ActorSystem): Duration =
duration * TestKitExtension(system).TestTimeFactor
/**
* Shut down an actor system and wait for termination.
* On failure debug output will be logged about the remaining actors in the system.
*
* If verifySystemShutdown is true, then an exception will be thrown on failure.
*/
def shutdownActorSystem(actorSystem: ActorSystem,
duration: Duration = 10 seconds,
verifySystemShutdown: Boolean = false): Unit = {
actorSystem.shutdown()
try actorSystem.awaitTermination(duration) catch {
case _: TimeoutException ⇒
val msg = "Failed to stop [%s] within [%s] \n%s".format(actorSystem.name, duration,
actorSystem.asInstanceOf[ActorSystemImpl].printTree)
if (verifySystemShutdown) throw new RuntimeException(msg)
else actorSystem.log.warning(msg)
}
}
}
/**

72
akka-testkit/src/test/java/akka/testkit/AkkaJUnitActorSystemResource.java Normal file
View file

@ -0,0 +1,72 @@
/**
* Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
*/
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.
*
* 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) {
if (config == null)
return ActorSystem.create(name);
else
return ActorSystem.create(name, config);
}
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;
}
}

7
akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
View file

@ -73,12 +73,7 @@ abstract class AkkaSpec(_system: ActorSystem)
final override def afterAll {
beforeTermination()
system.shutdown()
try system.awaitTermination(5 seconds) catch {
case _: TimeoutException ⇒
system.log.warning("Failed to stop [{}] within 5 seconds", system.name)
println(system.asInstanceOf[ActorSystemImpl].printTree)
}
shutdown(system)
afterTermination()
stopCoroner()
}

10
akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala
View file

@ -28,7 +28,7 @@ class AkkaSpecSpec extends WordSpec with MustMatchers {
a ! 42
}
} finally {
system.shutdown()
TestKit.shutdownActorSystem(system)
}
}
@ -43,7 +43,7 @@ class AkkaSpecSpec extends WordSpec with MustMatchers {
val ref = Seq(testActor, system.actorOf(Props.empty, "name"))
}
spec.ref foreach (_.isTerminated must not be true)
system.shutdown()
TestKit.shutdownActorSystem(system)
spec.awaitCond(spec.ref forall (_.isTerminated), 2 seconds)
}
@ -86,15 +86,15 @@ class AkkaSpecSpec extends WordSpec with MustMatchers {
val latch = new TestLatch(1)(system)
system.registerOnTermination(latch.countDown())
system.shutdown()
TestKit.shutdownActorSystem(system)
Await.ready(latch, 2 seconds)
Await.result(davyJones ? "Die!", timeout.duration) must be === "finally gone"
// this will typically also contain log messages which were sent after the logger shutdown
locker must contain(DeadLetter(42, davyJones, probe.ref))
} finally {
system.shutdown()
otherSystem.shutdown()
TestKit.shutdownActorSystem(system)
TestKit.shutdownActorSystem(otherSystem)
}
}
}

25
akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java
View file

@ -6,10 +6,8 @@ package akka.transactor;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Before;
import akka.testkit.*;
import org.junit.*;
import akka.actor.ActorSystem;
import akka.actor.ActorRef;
@ -17,10 +15,7 @@ import akka.actor.Props;
import scala.concurrent.Await;
import scala.concurrent.Future;
import static akka.pattern.Patterns.ask;
import akka.testkit.AkkaSpec;
import akka.testkit.EventFilter;
import akka.testkit.ErrorFilter;
import akka.testkit.TestEvent;
import akka.util.Timeout;
import static akka.japi.Util.immutableSeq;
@ -33,18 +28,12 @@ import scala.collection.JavaConverters;
import scala.collection.immutable.Seq;
public class UntypedCoordinatedIncrementTest {
private static ActorSystem system;
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("UntypedCoordinatedIncrementTest", AkkaSpec.testConf());
}
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("UntypedCoordinatedIncrementTest", AkkaSpec.testConf());
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
List<ActorRef> counters;
ActorRef failer;

26
akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java
View file

@ -6,10 +6,8 @@ package akka.transactor;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Before;
import akka.testkit.*;
import org.junit.*;
import akka.actor.ActorSystem;
import akka.actor.ActorRef;
@ -17,10 +15,7 @@ import akka.actor.Props;
import scala.concurrent.Await;
import scala.concurrent.Future;
import static akka.pattern.Patterns.ask;
import akka.testkit.AkkaSpec;
import akka.testkit.EventFilter;
import akka.testkit.ErrorFilter;
import akka.testkit.TestEvent;
import akka.util.Timeout;
import static akka.japi.Util.immutableSeq;
@ -34,18 +29,11 @@ import scala.collection.immutable.Seq;
public class UntypedTransactorTest {
private static ActorSystem system;
@ClassRule
public static AkkaJUnitActorSystemResource actorSystemResource =
new AkkaJUnitActorSystemResource("UntypedTransactorTest", AkkaSpec.testConf());
@BeforeClass
public static void beforeAll() {
system = ActorSystem.create("UntypedTransactorTest", AkkaSpec.testConf());
}
@AfterClass
public static void afterAll() {
system.shutdown();
system = null;
}
private final ActorSystem system = actorSystemResource.getSystem();
List<ActorRef> counters;
ActorRef failer;