Merge "Mark static methods"

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / services / sal / SalExperimenterMessageServiceImplTest.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/SalExperimenterMessageServiceImplTest.java
index 23d41b8733d2e9576e47424c4edb1096c01b3a0c..6b60dc7f2ce03ea6d53c2b513a3799c1dfb4a4d5 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/SalExperimenterMessageServiceImplTest.java
@@ -10,14 +10,16 @@ package org.opendaylight.openflowplugin.impl.services.sal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
 import org.junit.Test;
-import org.mockito.Matchers;
+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;
 import org.opendaylight.openflowplugin.extension.api.TypeVersionKey;
 import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
 import org.opendaylight.openflowplugin.impl.services.ServiceMocking;
@@ -28,14 +30,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 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.binding.DataContainer;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link org.opendaylight.openflowplugin.impl.services.sal.SalExperimenterMessageServiceImpl}.
  */
 public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
 
-    private static final Long DUMMY_XID_VALUE = 100L;
+    private static final Uint32 DUMMY_XID_VALUE = Uint32.valueOf(100);
     private SalExperimenterMessageServiceImpl salExperimenterMessageService;
     @Mock
     private ExtensionConverterProvider extensionConverterProvider;
@@ -44,15 +46,17 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
 
     @Override
     protected void setup() {
-        salExperimenterMessageService = new SalExperimenterMessageServiceImpl(mockedRequestContextStack, mockedDeviceContext, extensionConverterProvider);
-        Mockito.when(extensionConverterProvider.getMessageConverter(Matchers.<TypeVersionKey>any()))
+        salExperimenterMessageService = new SalExperimenterMessageServiceImpl(mockedRequestContextStack,
+                                                                              mockedDeviceContext,
+                                                                              extensionConverterProvider);
+        Mockito.when(extensionConverterProvider.getMessageConverter(ArgumentMatchers.<TypeVersionKey>any()))
                 .thenReturn(extensionConverter);
         Mockito.when(extensionConverter.getExperimenterId()).thenReturn(new ExperimenterId(43L));
         Mockito.when(extensionConverter.getType()).thenReturn(44L);
     }
 
     @Test
-    public void testSendExperimenter() throws Exception {
+    public void testSendExperimenter() {
         SendExperimenterInput sendExperimenterInput = buildSendExperimenterInput();
         salExperimenterMessageService.sendExperimenter(sendExperimenterInput);
         verify(mockedRequestContextStack).createRequestContext();
@@ -61,15 +65,15 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
     @Test
     public void testBuildRequest() throws Exception {
         SendExperimenterInput sendExperimenterInput = buildSendExperimenterInput();
-
-        final OfHeader request = salExperimenterMessageService.buildRequest(new Xid(DUMMY_XID_VALUE), sendExperimenterInput);
+        final OfHeader request =
+                salExperimenterMessageService.buildRequest(new Xid(DUMMY_XID_VALUE), sendExperimenterInput);
         assertEquals(DUMMY_XID_VALUE, request.getXid());
         assertTrue(request instanceof ExperimenterInput);
         final ExperimenterInput input = (ExperimenterInput) request;
         assertEquals(43L, input.getExperimenter().getValue().longValue());
         assertEquals(44L, input.getExpType().longValue());
-
-        Mockito.verify(extensionConverter).convert(sendExperimenterInput.getExperimenterMessageOfChoice());
+        Mockito.verify(extensionConverter).convert(eq(sendExperimenterInput.getExperimenterMessageOfChoice()),
+                ArgumentMatchers.any(ExtensionConvertorData.class));
     }
 
     private SendExperimenterInput buildSendExperimenterInput() {
@@ -81,9 +85,8 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
 
     private static class DummyExperimenter implements ExperimenterMessageOfChoice {
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<DummyExperimenter> implementedInterface() {
             return DummyExperimenter.class;
         }
     }
-
 }