Eliminate use of deprecated mockito methods

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / databroker / actors / dds / AbstractClientHandleTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java
index 3dfaac50b2b7eaedb6eac84e6784f052013ffe7c..24ab054124750659049d55c17bae0dd3b43f3152 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHandleTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.cluster.databroker.actors.dds;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -18,8 +18,8 @@ import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtil
 import akka.actor.ActorRef;
 import akka.actor.ActorSelection;
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestProbe;
+import akka.testkit.javadsl.TestKit;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.function.Function;
@@ -86,7 +86,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
         final long sequence = 0L;
         contextProbe.reply(new ConnectClientSuccess(CLIENT_ID, sequence, backendProbe.ref(),
                 Collections.emptyList(), dataTree, 3));
-        final InternalCommand command = clientContextProbe.expectMsgClass(InternalCommand.class);
+        final InternalCommand<ShardBackendInfo> command = clientContextProbe.expectMsgClass(InternalCommand.class);
         command.execute(client);
         //data tree mock
         when(dataTree.takeSnapshot()).thenReturn(dataTreeSnapshot);
@@ -94,6 +94,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
         handle = createHandle(parent);
     }
 
+    @SuppressWarnings("checkstyle:hiddenField")
     protected abstract T createHandle(AbstractClientHistory parent);
 
     /**
@@ -102,15 +103,16 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
      *
      * @param handle handle
      */
+    @SuppressWarnings("checkstyle:hiddenField")
     protected abstract void doHandleOperation(T handle);
 
     @After
-    public void tearDown() throws Exception {
-        JavaTestKit.shutdownActorSystem(system);
+    public void tearDown() {
+        TestKit.shutdownActorSystem(system);
     }
 
     @Test
-    public void testGetIdentifier() throws Exception {
+    public void testGetIdentifier() {
         Assert.assertEquals(TRANSACTION_ID, handle.getIdentifier());
     }
 
@@ -118,7 +120,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
     public void testAbort() throws Exception {
         doHandleOperation(handle);
         handle.abort();
-        final Envelope envelope = backendProbe.expectMsgClass(Envelope.class);
+        final Envelope<?> envelope = backendProbe.expectMsgClass(Envelope.class);
         final AbortLocalTransactionRequest request = (AbortLocalTransactionRequest) envelope.getMessage();
         Assert.assertEquals(TRANSACTION_ID, request.getTarget());
         checkClosed();
@@ -128,14 +130,14 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
     public void testLocalAbort() throws Exception {
         doHandleOperation(handle);
         handle.localAbort(new RuntimeException("fail"));
-        final Envelope envelope = backendProbe.expectMsgClass(Envelope.class);
+        final Envelope<?> envelope = backendProbe.expectMsgClass(Envelope.class);
         final AbortLocalTransactionRequest request = (AbortLocalTransactionRequest) envelope.getMessage();
         Assert.assertEquals(TRANSACTION_ID, request.getTarget());
         checkClosed();
     }
 
     @Test
-    public void testEnsureClosed() throws Exception {
+    public void testEnsureClosed() {
         doHandleOperation(handle);
         final Collection<AbstractProxyTransaction> transactions = handle.ensureClosed();
         Assert.assertNotNull(transactions);
@@ -143,7 +145,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
     }
 
     @Test
-    public void testEnsureProxy() throws Exception {
+    public void testEnsureProxy() {
         final Function<Long, AbstractProxyTransaction> function = mock(Function.class);
         final AbstractProxyTransaction expected = mock(AbstractProxyTransaction.class);
         when(function.apply(0L)).thenReturn(expected);
@@ -153,7 +155,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
     }
 
     @Test
-    public void testParent() throws Exception {
+    public void testParent() {
         Assert.assertEquals(parent, handle.parent());
     }
 
@@ -170,8 +172,8 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
      * @param <R>                  expected request type
      * @return request message
      */
-    protected <R extends Request> R backendRespondToRequest(final Class<R> expectedRequestClass,
-                                                            final Response response) {
+    protected <R extends Request<?, R>> R backendRespondToRequest(final Class<R> expectedRequestClass,
+                                                            final Response<?, ?> response) {
         final RequestEnvelope envelope = backendProbe.expectMsgClass(RequestEnvelope.class);
         Assert.assertEquals(expectedRequestClass, envelope.getMessage().getClass());
         final AbstractClientConnection<ShardBackendInfo> connection = client.getConnection(0L);
@@ -187,7 +189,7 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
             final FailureEnvelope responseEnvelope = new FailureEnvelope(fail, sessionId, txSequence, executionTime);
             AccessClientUtil.completeRequest(connection, responseEnvelope);
         }
-        return (R) envelope.getMessage();
+        return expectedRequestClass.cast(envelope.getMessage());
     }
 
     protected T getHandle() {
@@ -208,4 +210,4 @@ public abstract class AbstractClientHandleTest<T extends AbstractClientHandle<Ab
         return mock;
     }
 
-}
\ No newline at end of file
+}