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

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

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