X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-client%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fclient%2FAbstractClientConnectionTest.java;h=1d38b62b8d8eff6ae1b22131223a2a0cdedceb76;hp=3a2abbe31cbb23493513c55aa20112989ccc8bd4;hb=25be1b9989e89b50a9207b5e47178084e01eeec6;hpb=a12fb3d06006f9f5ca90f4323dcaaad4f5ad1f62

diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java
index 3a2abbe31c..1d38b62b8d 100644
--- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java
+++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java
@@ -8,7 +8,11 @@
 package org.opendaylight.controller.cluster.access.client;
 
 import static org.hamcrest.CoreMatchers.hasItems;
-import static org.mockito.Matchers.isA;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
@@ -16,13 +20,12 @@ import static org.opendaylight.controller.cluster.access.client.ConnectionEntryM
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestProbe;
+import akka.testkit.javadsl.TestKit;
 import com.google.common.collect.Iterables;
-import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.function.Consumer;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.MockitoAnnotations;
@@ -60,13 +63,13 @@ public abstract class AbstractClientConnectionTest<T extends AbstractClientConne
     protected TestProbe replyToProbe;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
         system = ActorSystem.apply();
         backendProbe = new TestProbe(system);
         contextProbe = new TestProbe(system);
-        context = new ClientActorContext(contextProbe.ref(), system.scheduler(), system.dispatcher(),
-                PERSISTENCE_ID, CLIENT_ID);
+        context = new ClientActorContext(contextProbe.ref(), PERSISTENCE_ID, system,
+                CLIENT_ID, AccessClientUtil.newMockClientActorConfig());
         replyToProbe = new TestProbe(system);
         connection = createConnection();
     }
@@ -74,15 +77,15 @@ public abstract class AbstractClientConnectionTest<T extends AbstractClientConne
     protected abstract T createConnection();
 
     @Test
-    public void testLocalActor() throws Exception {
-        Assert.assertEquals(contextProbe.ref(), connection.localActor());
+    public void testLocalActor() {
+        assertEquals(contextProbe.ref(), connection.localActor());
     }
 
     @Test
-    public abstract void testReconnectConnection() throws Exception;
+    public abstract void testReconnectConnection();
 
     @Test
-    public void testPoison() throws Exception {
+    public void testPoison() {
         final Consumer<Response<?, ?>> callback = mock(Consumer.class);
         final Request<?, ?> request = createRequest(replyToProbe.ref());
         final ConnectionEntry entry = new ConnectionEntry(request, callback, 0L);
@@ -92,12 +95,12 @@ public abstract class AbstractClientConnectionTest<T extends AbstractClientConne
     }
 
     @Test
-    public void testSendRequestReceiveResponse() throws Exception {
+    public void testSendRequestReceiveResponse() {
         final Consumer<Response<?, ?>> callback = mock(Consumer.class);
         final Request<?, ?> request = createRequest(replyToProbe.ref());
         connection.sendRequest(request, callback);
         final RequestEnvelope requestEnvelope = backendProbe.expectMsgClass(RequestEnvelope.class);
-        Assert.assertEquals(request, requestEnvelope.getMessage());
+        assertEquals(request, requestEnvelope.getMessage());
         final LocalHistoryIdentifier historyId = new LocalHistoryIdentifier(CLIENT_ID, 0L);
         final RequestSuccess<?, ?> message = new TransactionAbortSuccess(new TransactionIdentifier(historyId, 0L), 0L);
         final ResponseEnvelope<?> envelope = new SuccessEnvelope(message, 0L, 0L, 0L);
@@ -106,44 +109,43 @@ public abstract class AbstractClientConnectionTest<T extends AbstractClientConne
     }
 
     @Test
-    public void testRun() throws Exception {
+    public void testRun() {
         final ClientActorBehavior<U> behavior = mock(ClientActorBehavior.class);
-        Assert.assertSame(behavior, connection.runTimer(behavior));
+        assertSame(behavior, connection.runTimer(behavior));
     }
 
     @Test
-    public void testCheckTimeoutEmptyQueue() throws Exception {
-        final Optional<Long> timeout = connection.checkTimeout(context.ticker().read());
-        Assert.assertFalse(timeout.isPresent());
+    public void testCheckTimeoutEmptyQueue() {
+        assertEquals(OptionalLong.empty(), connection.checkTimeout(context.ticker().read()));
     }
 
     @Test
-    public void testCheckTimeout() throws Exception {
+    public void testCheckTimeout() {
         final Consumer<Response<?, ?>> callback = mock(Consumer.class);
         connection.sendRequest(createRequest(replyToProbe.ref()), callback);
         final long now = context.ticker().read();
-        final Optional<Long> timeout = connection.checkTimeout(now);
-        Assert.assertTrue(timeout.isPresent());
+        final OptionalLong timeout = connection.checkTimeout(now);
+        assertTrue(timeout.isPresent());
     }
 
     @Test
-    public void testReplay() throws Exception {
+    public void testReplay() {
         final Consumer<Response<?, ?>> callback = mock(Consumer.class);
         final Request<?, ?> request1 = createRequest(replyToProbe.ref());
         final Request<?, ?> request2 = createRequest(replyToProbe.ref());
         connection.sendRequest(request1, callback);
         connection.sendRequest(request2, callback);
         final Iterable<ConnectionEntry> entries = connection.startReplay();
-        Assert.assertThat(entries, hasItems(entryWithRequest(request1), entryWithRequest(request2)));
-        Assert.assertEquals(2, Iterables.size(entries));
+        assertThat(entries, hasItems(entryWithRequest(request1), entryWithRequest(request2)));
+        assertEquals(2, Iterables.size(entries));
         Iterables.removeIf(entries, e -> true);
         final ReconnectForwarder forwarder = mock(ReconnectForwarder.class);
         connection.finishReplay(forwarder);
     }
 
     @After
-    public void tearDown() throws Exception {
-        JavaTestKit.shutdownActorSystem(system);
+    public void tearDown() {
+        TestKit.shutdownActorSystem(system);
     }
 
     protected Request<?, ?> createRequest(final ActorRef replyTo) {
@@ -152,4 +154,4 @@ public abstract class AbstractClientConnectionTest<T extends AbstractClientConne
         return new AbortLocalTransactionRequest(identifier, replyTo);
     }
 
-}
\ No newline at end of file
+}