Clean up use of MockitoAnnotations.initMocks

[controller.git] / opendaylight / md-sal / cds-access-client / src / test / java / org / opendaylight / controller / cluster / access / client / ClientActorContextTest.java

diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ClientActorContextTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ClientActorContextTest.java
index 3ecc68bdb45b3f30314573893a4a622c3fc2561b..1eca0b563d2c47a240a6fd8a620c7f195c5d2568 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ClientActorContextTest.java
+++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ClientActorContextTest.java
@@ -10,22 +10,23 @@ package org.opendaylight.controller.cluster.access.client;
 import static org.junit.Assert.assertSame;
 
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestProbe;
+import akka.testkit.javadsl.TestKit;
 import com.google.common.base.Ticker;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.FrontendType;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
-import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ClientActorContextTest {
     private static final MemberName MEMBER_NAME = MemberName.forName("member-1");
     private static final FrontendType FRONTEND_TYPE =
@@ -42,11 +43,10 @@ public class ClientActorContextTest {
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
         system = ActorSystem.apply();
         probe = new TestProbe(system);
-        ctx = new ClientActorContext(probe.ref(), system.scheduler(), system.dispatcher(),
-                PERSISTENCE_ID, CLIENT_ID);
+        ctx = new ClientActorContext(probe.ref(), PERSISTENCE_ID, system,
+                CLIENT_ID, AccessClientUtil.newMockClientActorConfig());
     }
 
     @Test
@@ -62,20 +62,19 @@ public class ClientActorContextTest {
     }
 
     @Test
-    public void testExecuteInActor() throws Exception {
+    public void testExecuteInActor() {
         ctx.executeInActor(command);
         probe.expectMsg(command);
     }
 
     @Test
-    public void testExecuteInActorScheduled() throws Exception {
-        final FiniteDuration delay = Duration.apply(1, TimeUnit.SECONDS);
-        ctx.executeInActor(command, delay);
+    public void testExecuteInActorScheduled() {
+        ctx.executeInActor(command, FiniteDuration.create(1, TimeUnit.SECONDS));
         probe.expectMsg(command);
     }
 
     @After
-    public void tearDown() throws Exception {
-        JavaTestKit.shutdownActorSystem(system);
+    public void tearDown() {
+        TestKit.shutdownActorSystem(system);
     }
 }