Decompose RPC implementation classes

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

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SendExperimenterImplTest.java
similarity index 58%
rename from openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java
rename to openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SendExperimenterImplTest.java
index 343582f415ccf104010ec40be16510956cd619da..59095ce5be450eb09ad207d4c7ad484c34d3bb66 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SendExperimenterImplTest.java
@@ -5,18 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.services.sal;
 
 import static org.junit.Assert.assertEquals;
 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 org.junit.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.opendaylight.openflowplugin.api.openflow.device.Xid;
 import org.opendaylight.openflowplugin.extension.api.ConverterMessageToOFJava;
 import org.opendaylight.openflowplugin.extension.api.ExtensionConvertorData;
@@ -28,59 +28,57 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.experimenter.message.servic
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.experimenter.core.message.ExperimenterMessageOfChoice;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
- * Test for {@link org.opendaylight.openflowplugin.impl.services.sal.SalExperimenterMessageServiceImpl}.
+ * Test for {@link SendExperimenterImpl}.
  */
-public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
-
+public class SendExperimenterImplTest extends ServiceMocking {
     private static final Uint32 DUMMY_XID_VALUE = Uint32.valueOf(100);
-    private SalExperimenterMessageServiceImpl salExperimenterMessageService;
+
     @Mock
     private ExtensionConverterProvider extensionConverterProvider;
     @Mock
     private ConverterMessageToOFJava extensionConverter;
 
+    private SendExperimenterImpl sendExperimenter;
+
     @Override
     protected void setup() {
-        salExperimenterMessageService = new SalExperimenterMessageServiceImpl(mockedRequestContextStack,
-                                                                              mockedDeviceContext,
-                                                                              extensionConverterProvider);
-        Mockito.when(extensionConverterProvider.getMessageConverter(ArgumentMatchers.<TypeVersionKey>any()))
-                .thenReturn(extensionConverter);
-        Mockito.when(extensionConverter.getExperimenterId()).thenReturn(new ExperimenterId(Uint32.valueOf(43)));
-        Mockito.when(extensionConverter.getType()).thenReturn(Uint32.valueOf(44));
+        when(extensionConverterProvider.getMessageConverter(ArgumentMatchers.<TypeVersionKey>any()))
+            .thenReturn(extensionConverter);
+        when(extensionConverter.getExperimenterId()).thenReturn(new ExperimenterId(Uint32.valueOf(43)));
+        when(extensionConverter.getType()).thenReturn(Uint32.valueOf(44));
+
+        sendExperimenter = new SendExperimenterImpl(mockedRequestContextStack, mockedDeviceContext,
+            extensionConverterProvider);
     }
 
     @Test
     public void testSendExperimenter() {
-        SendExperimenterInput sendExperimenterInput = buildSendExperimenterInput();
-        salExperimenterMessageService.sendExperimenter(sendExperimenterInput);
+        sendExperimenter.invoke(buildSendExperimenterInput());
         verify(mockedRequestContextStack).createRequestContext();
     }
 
     @Test
     public void testBuildRequest() throws Exception {
-        SendExperimenterInput sendExperimenterInput = buildSendExperimenterInput();
-        final OfHeader request =
-                salExperimenterMessageService.buildRequest(new Xid(DUMMY_XID_VALUE), sendExperimenterInput);
+        final var sendExperimenterInput = buildSendExperimenterInput();
+        final var request = sendExperimenter.buildRequest(new Xid(DUMMY_XID_VALUE), sendExperimenterInput);
         assertEquals(DUMMY_XID_VALUE, request.getXid());
         assertTrue(request instanceof ExperimenterInput);
-        final ExperimenterInput input = (ExperimenterInput) request;
+        final var input = (ExperimenterInput) request;
         assertEquals(43L, input.getExperimenter().getValue().longValue());
         assertEquals(44L, input.getExpType().longValue());
-        Mockito.verify(extensionConverter).convert(eq(sendExperimenterInput.getExperimenterMessageOfChoice()),
-                ArgumentMatchers.any(ExtensionConvertorData.class));
+        verify(extensionConverter).convert(eq(sendExperimenterInput.getExperimenterMessageOfChoice()),
+                any(ExtensionConvertorData.class));
     }
 
     private SendExperimenterInput buildSendExperimenterInput() {
-        SendExperimenterInputBuilder sendExperimenterInputBld = new SendExperimenterInputBuilder()
-                .setNode(new NodeRef(mockedDeviceInfo.getNodeInstanceIdentifier()))
-                .setExperimenterMessageOfChoice(new DummyExperimenter());
-        return sendExperimenterInputBld.build();
+        return new SendExperimenterInputBuilder()
+            .setNode(new NodeRef(mockedDeviceInfo.getNodeInstanceIdentifier()))
+            .setExperimenterMessageOfChoice(new DummyExperimenter())
+            .build();
     }
 
     private static final class DummyExperimenter implements ExperimenterMessageOfChoice {