Decompose RPC implementation classes

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / services / sal / SalEchoServiceImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java
index 44e0271a8c06908d490e561c730eec0c126a146c..1b338020689e9dd13152918a61c00eb0f4b46867 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java
@@ -7,53 +7,45 @@
  */
 package org.opendaylight.openflowplugin.impl.services.sal;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import java.util.concurrent.Future;
-import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.Mockito;
+import org.opendaylight.openflowplugin.impl.services.SendEchoImpl;
 import org.opendaylight.openflowplugin.impl.services.ServiceMocking;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutputBuilder;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class SalEchoServiceImplTest extends ServiceMocking {
-
     private static final byte[] DUMMY_DATA = "DUMMY DATA".getBytes();
-    SalEchoServiceImpl salEchoService;
+
+    private SendEchoImpl salEchoService;
 
     @Override
     protected void setup() {
-        salEchoService = new SalEchoServiceImpl(mockedRequestContextStack, mockedDeviceContext);
+        salEchoService = new SendEchoImpl(mockedRequestContextStack, mockedDeviceContext);
     }
 
     @Test
     public void testSendEcho() throws Exception {
-        final EchoOutput echoOut = new EchoOutputBuilder()
-                .setData(DUMMY_DATA)
-                .build();
-        final RpcResult<EchoOutput> replyRpcResult = RpcResultBuilder.success(echoOut).build();
-        final ListenableFuture<RpcResult<EchoOutput>> replyFt = Futures.immediateFuture(replyRpcResult);
-        Mockito.when(mockedRequestContext.getFuture()).thenReturn(replyFt);
-        SendEchoInput sendEchoInput = new SendEchoInputBuilder()
-                .setData(DUMMY_DATA)
-                .build();
-
-        final Future<RpcResult<SendEchoOutput>> echoOutput = salEchoService.sendEcho(sendEchoInput);
-
-        Assert.assertNotNull(echoOutput);
-        Assert.assertTrue(echoOutput.isDone());
-        Assert.assertTrue(echoOutput.get().isSuccessful());
+        final var echoOut = new EchoOutputBuilder().setData(DUMMY_DATA).build();
+        final var replyRpcResult = RpcResultBuilder.success(echoOut).build();
+        final var replyFt = Futures.immediateFuture(replyRpcResult);
+        when(mockedRequestContext.getFuture()).thenReturn(replyFt);
+        final var sendEchoInput = new SendEchoInputBuilder().setData(DUMMY_DATA).build();
+
+        final var echoOutput = salEchoService.invoke(sendEchoInput);
+
+        assertNotNull(echoOutput);
+        assertTrue(echoOutput.isDone());
+        assertTrue(echoOutput.get().isSuccessful());
         verify(mockedRequestContextStack).createRequestContext();
         verify(mockedOutboundQueue).commitEntry(eq(Uint32.valueOf(2121)), any(), any());
     }