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

Re-implement javadsl testkit (#22240)

Browse source 
* re-implement javadsl testkit

* fix mima problem

* rebase master

* move ImplicitSender/DefaultTimeout to scaladsl

* undo the change of moving scala api

* fix return type and add doc

* resolve conflicts and add more comments
This commit is contained in:
Hawstein 2017-03-17 03:02:47 +08:00 • committed by Patrik Nordwall
parent 3643f18ded
commit 6434cbe868
93 changed files with 1147 additions and 619 deletions
Download patch file Download diff file Expand all files Collapse all files

25
akka-docs/rst/java/code/jdocs/actor/ActorDocTest.java
View file

@ -5,12 +5,12 @@
package jdocs.actor;
import akka.actor.*;
import akka.testkit.javadsl.TestKit;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import jdocs.AbstractJavaTest;
import static jdocs.actor.Messages.Swap.Swap;
import static jdocs.actor.Messages.*;
import static akka.japi.Util.immutableSeq;
import akka.actor.CoordinatedShutdown;
import akka.util.Timeout;
@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import akka.testkit.TestActors;
import scala.concurrent.Await;
import akka.testkit.JavaTestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -473,14 +472,14 @@ public class ActorDocTest extends AbstractJavaTest {
final ActorRef myActor = system.actorOf(Props.create(MyActor.class), "myactor");
//#system-actorOf
try {
new JavaTestKit(system) {
new TestKit(system) {
{
myActor.tell("hello", getRef());
expectMsgEquals("hello");
}
};
} finally {
JavaTestKit.shutdownActorSystem(system);
TestKit.shutdownActorSystem(system);
}
}
@ -489,14 +488,14 @@ public class ActorDocTest extends AbstractJavaTest {
final ActorSystem system = ActorSystem.create("MySystem", config);
final ActorRef actor = system.actorOf(Props.create(GraduallyBuiltActor.class), "graduallyBuiltActor");
try {
new JavaTestKit(system) {
new TestKit(system) {
{
actor.tell("hello", getRef());
expectMsgEquals("hello");
}
};
} finally {
JavaTestKit.shutdownActorSystem(system);
TestKit.shutdownActorSystem(system);
}
}
@ -564,7 +563,7 @@ public class ActorDocTest extends AbstractJavaTest {
@Test
public void using_receiveTimeout() {
final ActorRef myActor = system.actorOf(Props.create(ReceiveTimeoutActor.class));
new JavaTestKit(system) {
new TestKit(system) {
{
myActor.tell("Hello", getRef());
expectMsgEquals("Hello world");
@ -617,7 +616,7 @@ public class ActorDocTest extends AbstractJavaTest {
@Test
public void using_hot_swap() {
final ActorRef actor = system.actorOf(Props.create(HotSwapActor.class), "hot");
new JavaTestKit(system) {
new TestKit(system) {
{
actor.tell("foo", getRef());
actor.tell("foo", getRef());
@ -690,7 +689,7 @@ public class ActorDocTest extends AbstractJavaTest {
public void using_watch() {
ActorRef actor = system.actorOf(Props.create(WatchActor.class));
new JavaTestKit(system) {
new TestKit(system) {
{
actor.tell("kill", getRef());
expectMsgEquals("finished");
@ -737,7 +736,7 @@ public class ActorDocTest extends AbstractJavaTest {
ActorRef a = system.actorOf(Props.empty());
ActorRef b = system.actorOf(Props.create(Follower.class));
new JavaTestKit(system) {
new TestKit(system) {
{
watch(b);
system.stop(a);
@ -748,7 +747,7 @@ public class ActorDocTest extends AbstractJavaTest {
@Test
public void usePatternsAskPipe() {
new JavaTestKit(system) {
new TestKit(system) {
{
ActorRef actorA = system.actorOf(TestActors.echoActorProps());
ActorRef actorB = system.actorOf(TestActors.echoActorProps());
@ -783,7 +782,7 @@ public class ActorDocTest extends AbstractJavaTest {
@Test
public void useKill() {
new JavaTestKit(system) {
new TestKit(system) {
{
ActorRef victim = system.actorOf(TestActors.echoActorProps());
watch(victim);
@ -797,7 +796,7 @@ public class ActorDocTest extends AbstractJavaTest {
@Test
public void usePoisonPill() {
new JavaTestKit(system) {
new TestKit(system) {
{
ActorRef victim = system.actorOf(TestActors.echoActorProps());
watch(victim);

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

@ -4,6 +4,7 @@
package jdocs.actor;
import jdocs.AbstractJavaTest;
import akka.testkit.javadsl.TestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -14,7 +15,6 @@ import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.testkit.JavaTestKit;
//#import
import akka.actor.Actor;
@ -94,7 +94,7 @@ public class DependencyInjectionDocTest extends AbstractJavaTest {
Props.create(DependencyInjector.class, applicationContext, "TheActor"),
"TheActor");
//#creating-indirectly
new JavaTestKit(system) {
new TestKit(system) {
{
myActor.tell("hello", getRef());
expectMsgEquals("...");

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

@ -6,6 +6,7 @@ package jdocs.actor;
import akka.actor.*;
import akka.testkit.javadsl.TestKit;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import jdocs.AbstractJavaTest;
@ -14,7 +15,6 @@ import java.util.Optional;
import static akka.pattern.Patterns.ask;
//#testkit
import akka.testkit.JavaTestKit;
import akka.testkit.TestProbe;
import akka.testkit.ErrorFilter;
import akka.testkit.EventFilter;
@ -145,7 +145,7 @@ public class FaultHandlingTest extends AbstractJavaTest {
@AfterClass
public static void cleanup() {
JavaTestKit.shutdownActorSystem(system);
TestKit.shutdownActorSystem(system);
system = null;
}

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

@ -8,6 +8,7 @@ import java.util.concurrent.TimeUnit;
import akka.testkit.AkkaJUnitActorSystemResource;
import jdocs.AbstractJavaTest;
import akka.testkit.javadsl.TestKit;
import org.junit.ClassRule;
import org.junit.Test;
@ -18,7 +19,6 @@ import akka.actor.Inbox;
import akka.actor.PoisonPill;
import akka.actor.Terminated;
import akka.testkit.AkkaSpec;
import akka.testkit.JavaTestKit;
public class InboxDocTest extends AbstractJavaTest {
@ -30,7 +30,7 @@ public class InboxDocTest extends AbstractJavaTest {
@Test
public void demonstrateInbox() {
final JavaTestKit probe = new JavaTestKit(system);
final TestKit probe = new TestKit(system);
final ActorRef target = probe.getRef();
//#inbox
final Inbox inbox = Inbox.create(system);
@ -49,7 +49,7 @@ public class InboxDocTest extends AbstractJavaTest {
@Test
public void demonstrateWatch() {
final JavaTestKit probe = new JavaTestKit(system);
final TestKit probe = new TestKit(system);
final ActorRef target = probe.getRef();
//#watch
final Inbox inbox = Inbox.create(system);

8
akka-docs/rst/java/code/jdocs/actor/InitializationDocTest.java
View file

@ -8,8 +8,8 @@ import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.japi.pf.FI;
import akka.testkit.JavaTestKit;
import jdocs.AbstractJavaTest;
import akka.testkit.javadsl.TestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -120,7 +120,7 @@ public class InitializationDocTest extends AbstractJavaTest {
@Test
public void testIt() {
new JavaTestKit(system) {{
new TestKit(system) {{
ActorRef testactor = system.actorOf(Props.create(MessageInitExample.class), "testactor");
String msg = "U OK?";
@ -135,7 +135,7 @@ public class InitializationDocTest extends AbstractJavaTest {
@Test
public void testGenericActor() {
new JavaTestKit(system) {{
new TestKit(system) {{
ActorRef genericTestActor = system.actorOf(Props.create(GenericActor.class), "genericActor");
GenericMessage<String> genericMessage = new GenericMessage<String>("a");
@ -146,7 +146,7 @@ public class InitializationDocTest extends AbstractJavaTest {
@Test
public void actorShouldNotRespondForEmptyMessage() {
new JavaTestKit(system) {{
new TestKit(system) {{
ActorRef genericTestActor = system.actorOf(Props.create(GenericActorWithPredicate.class), "genericActorWithPredicate");
GenericMessage<String> emptyGenericMessage = new GenericMessage<String>("");
GenericMessage<String> nonEmptyGenericMessage = new GenericMessage<String>("a");

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

@ -7,8 +7,8 @@ package jdocs.actor;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.testkit.JavaTestKit;
import jdocs.AbstractJavaTest;
import akka.testkit.javadsl.TestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -26,14 +26,14 @@ public class SampleActorTest extends AbstractJavaTest {
@AfterClass
public static void tearDown() {
JavaTestKit.shutdownActorSystem(system);
TestKit.shutdownActorSystem(system);
system = null;
}
@Test
public void testSampleActor()
{
new JavaTestKit(system) {{
new TestKit(system) {{
final ActorRef subject = system.actorOf(Props.create(SampleActor.class), "sample-actor");
final ActorRef probeRef = getRef();

8
akka-docs/rst/java/code/jdocs/actor/fsm/BuncherTest.java
View file

@ -7,8 +7,8 @@ package jdocs.actor.fsm;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.testkit.JavaTestKit;
import jdocs.AbstractJavaTest;
import akka.testkit.javadsl.TestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -31,13 +31,13 @@ public class BuncherTest extends AbstractJavaTest {
@AfterClass
public static void tearDown() {
JavaTestKit.shutdownActorSystem(system);
TestKit.shutdownActorSystem(system);
system = null;
}
@Test
public void testBuncherActorBatchesCorrectly() {
new JavaTestKit(system) {{
new TestKit(system) {{
final ActorRef buncher =
system.actorOf(Props.create(Buncher.class));
final ActorRef probe = getRef();
@ -64,7 +64,7 @@ public class BuncherTest extends AbstractJavaTest {
@Test
public void testBuncherActorDoesntBatchUninitialized() {
new JavaTestKit(system) {{
new TestKit(system) {{
final ActorRef buncher =
system.actorOf(Props.create(Buncher.class));
final ActorRef probe = getRef();

6
akka-docs/rst/java/code/jdocs/actor/fsm/FSMDocTest.java
View file

@ -5,8 +5,8 @@
package jdocs.actor.fsm;
import akka.actor.*;
import akka.testkit.JavaTestKit;
import jdocs.AbstractJavaTest;
import akka.testkit.javadsl.TestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -28,7 +28,7 @@ public class FSMDocTest extends AbstractJavaTest {
@AfterClass
public static void tearDown() {
JavaTestKit.shutdownActorSystem(system);
TestKit.shutdownActorSystem(system);
system = null;
}
@ -160,7 +160,7 @@ public class FSMDocTest extends AbstractJavaTest {
@Test
public void testLoggingFSM()
{
new JavaTestKit(system) {{
new TestKit(system) {{
final ActorRef logger =
system.actorOf(Props.create(MyFSM.class));
final ActorRef probe = getRef();