Add preliminary support for Akka 2.5 as described in #6

pom.xml

@@ -38,8 +38,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.version>4.12</junit.version>
-        <akka.version>2.3.15</akka.version>
-        <slf4j.version>1.7.21</slf4j.version>
+        <akka.version>2.5.0-RC2</akka.version>
+        <slf4j.version>1.7.25</slf4j.version>
         <akka-persistence-inmemory.version>0.2.1</akka-persistence-inmemory.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-javadoc-plugin.version>2.10.2</maven-javadoc-plugin.version>

src/main/java/org/zapodot/akka/junit/ActorSystemRule.java

@@ -1,7 +1,7 @@
 package org.zapodot.akka.junit;
 
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;
 import org.junit.rules.TestRule;
 
 /**
@@ -38,10 +38,10 @@ public interface ActorSystemRule extends TestRule {
     ActorSystem system();
 
     /**
-     * Convienience method that provides easy access to a {@link JavaTestKit} instance.
+     * Convienience method that provides easy access to a {@link TestKit} instance.
      *
-     * @return the {@link JavaTestKit} instance that was created before the test ran
+     * @return the {@link TestKit} instance that was created before the test ran
      */
-    JavaTestKit testKit();
+    TestKit testKit();
 
 }

src/main/java/org/zapodot/akka/junit/ActorSystemRuleImpl.java

@@ -3,8 +3,8 @@
 import akka.actor.ActorSystem;
 import akka.actor.Props;
 import akka.actor.UnhandledMessage;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestActorRef;
+import akka.testkit.javadsl.TestKit;
 import com.typesafe.config.Config;
 import org.junit.rules.ExternalResource;
 import org.slf4j.Logger;
@@ -29,7 +29,7 @@ public class ActorSystemRuleImpl extends ExternalResource implements ActorSystem
     private ActorSystem actorSystem;
     private Config config = null;
     private TestActorRef<ConsumingActor> unhandledMessagesConsumer;
-    private JavaTestKit javaTestKit;
+    private TestKit javaTestKit;
     private final long shutdownTimeoutSeconds;
 
 
@@ -90,7 +90,7 @@ public ActorSystem system() {
     }
 
     @Override
-    public JavaTestKit testKit() {
+    public TestKit testKit() {
         return javaTestKit;
     }
 
@@ -101,18 +101,16 @@ protected void before() throws Throwable {
 
         unhandledMessagesConsumer = TestActorRef.create(actorSystem, Props.create(ConsumingActor.class), "unhandledMessagesConsumer");
         actorSystem.eventStream().subscribe(unhandledMessagesConsumer, UnhandledMessage.class);
-        javaTestKit = new JavaTestKit(actorSystem);
+        javaTestKit = new TestKit(actorSystem);
 
     }
 
     @Override
     protected void after() {
 
         javaTestKit = null;
-        if (!actorSystem.isTerminated()) {
-            LOGGER.debug("Shutting down ActorSystem \"{}\"", name);
-            JavaTestKit.shutdownActorSystem(actorSystem, Duration.apply(shutdownTimeoutSeconds, TimeUnit.SECONDS), true);
-        }
+        LOGGER.debug("Shutting down ActorSystem \"{}\"", name);
+        TestKit.shutdownActorSystem(actorSystem, Duration.apply(shutdownTimeoutSeconds, TimeUnit.SECONDS), true);
         actorSystem = null;
     }
 

src/test/java/org/zapodot/akka/junit/TestKitTest.java

@@ -3,7 +3,7 @@
 import akka.actor.ActorRef;
 import akka.actor.Props;
 import akka.actor.UntypedActor;
-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;
 import org.junit.Rule;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
@@ -35,7 +35,7 @@ public void onReceive(final Object message) throws Exception {
 
     @Test
     public void testRule() throws Exception {
-        final JavaTestKit javaTestKit = testKitRule.testKit();
+        final TestKit javaTestKit = testKitRule.testKit();
         final ActorRef testActor = javaTestKit.getTestActor();
 
         final String message = "test";
@@ -48,7 +48,7 @@ public void testRule() throws Exception {
     public void testRuleAsync() throws Exception {
         final Props simpleActorProps = Props.create(SimpleActor.class);
         final ActorRef simpleActorRef = testKitRule.system().actorOf(simpleActorProps);
-        final JavaTestKit testProbe = testKitRule.testKit();
+        final TestKit testProbe = testKitRule.testKit();
 
         final String msg = "Hello AKKA";
         simpleActorRef.tell(msg, testProbe.getTestActor());