Migrate openflowplugim-impl tests to uint types

[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 866cc862db70907a740a248fe4037e1dff018ab9..991944f40db483dc3182d93a95702ab98a05eb47 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,10 +10,11 @@ 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;
@@ -29,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;
@@ -48,14 +49,14 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
         salExperimenterMessageService = new SalExperimenterMessageServiceImpl(mockedRequestContextStack,
                                                                               mockedDeviceContext,
                                                                               extensionConverterProvider);
-        Mockito.when(extensionConverterProvider.getMessageConverter(Matchers.<TypeVersionKey>any()))
+        Mockito.when(extensionConverterProvider.getMessageConverter(ArgumentMatchers.<TypeVersionKey>any()))
                 .thenReturn(extensionConverter);
-        Mockito.when(extensionConverter.getExperimenterId()).thenReturn(new ExperimenterId(43L));
+        Mockito.when(extensionConverter.getExperimenterId()).thenReturn(new ExperimenterId(Uint32.valueOf(43)));
         Mockito.when(extensionConverter.getType()).thenReturn(44L);
     }
 
     @Test
-    public void testSendExperimenter() throws Exception {
+    public void testSendExperimenter() {
         SendExperimenterInput sendExperimenterInput = buildSendExperimenterInput();
         salExperimenterMessageService.sendExperimenter(sendExperimenterInput);
         verify(mockedRequestContextStack).createRequestContext();
@@ -71,8 +72,8 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
         final ExperimenterInput input = (ExperimenterInput) request;
         assertEquals(43L, input.getExperimenter().getValue().longValue());
         assertEquals(44L, input.getExpType().longValue());
-        Mockito.verify(extensionConverter).convert(Matchers.eq(sendExperimenterInput.getExperimenterMessageOfChoice()),
-                Matchers.any(ExtensionConvertorData.class));
+        Mockito.verify(extensionConverter).convert(eq(sendExperimenterInput.getExperimenterMessageOfChoice()),
+                ArgumentMatchers.any(ExtensionConvertorData.class));
     }
 
     private SendExperimenterInput buildSendExperimenterInput() {
@@ -84,7 +85,7 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking {
 
     private static class DummyExperimenter implements ExperimenterMessageOfChoice {
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<DummyExperimenter> implementedInterface() {
             return DummyExperimenter.class;
         }
     }