Bump upstreams

[lispflowmapping.git] / mappingservice / implementation / src / test / java / org / opendaylight / lispflowmapping / implementation / LispMappingServiceTest.java

diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java
index 6fe0df327a4ad93a50808fb4d597771be73246cf..49ef8f72ff677a21b40b7fbfea53bb3ce6c499a9 100644 (file)
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java
@@ -30,8 +30,8 @@ import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingServic
 import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.mdsal.binding.api.NotificationService;
-import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.binding.api.RpcService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
@@ -61,10 +61,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ma
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.OdlLispSbService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotifyInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotifyInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapReplyInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapRequest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapRequestInputBuilder;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.util.BindingMap;
@@ -78,20 +80,21 @@ public class LispMappingServiceTest {
     @Mock(name = "tlsMapReply") private static ThreadLocal<MapReply> tlsMapReplyMock;
     @Mock(name = "tlsMapNotify") private static ThreadLocal<Pair<MapNotify, List<TransportAddress>>> tlsMapNotifyMock;
     @Mock(name = "tlsMapRequest") private static ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequestMock;
-    @Mock private static Registration rpcRegistration;
     @Mock(name = "listenerRegistration") private static Registration listenerRegistration;
     @Mock(name = "cssRegistration") private static Registration cssRegistration;
+    @Mock(name = "sendMapRequest") private static SendMapRequest sendMapRequest;
+    @Mock(name = "sendMapReply") private static SendMapReply sendMapReply;
+    @Mock(name = "sendMapNotify") private static SendMapNotify sendMapNotify;
 
     private final NotificationService notificationService = Mockito.mock(NotificationService.class);
-    private final RpcProviderService rpcProviderService = Mockito.mock(RpcProviderService.class);
+    private final RpcService rpcService = Mockito.mock(RpcService.class);
     private final IMappingService mappingService = Mockito.mock(IMappingService.class);
-    private final OdlLispSbService odlLispSbService = Mockito.mock(OdlLispSbService.class);
     private final ClusterSingletonServiceProvider clusterSingletonService = Mockito.mock(
             ClusterSingletonServiceProvider.class);
 
     @InjectMocks
     private final LispMappingService lispMappingService = new LispMappingService(
-            mappingService, odlLispSbService, clusterSingletonService, rpcProviderService, notificationService);
+            mappingService, clusterSingletonService, rpcService, notificationService);
 
     private static final byte[] IPV4_BYTES_1 =       new byte[] {1, 2, 3, 0};
     private static final byte[] IPV4_BYTES_2 =       new byte[] {1, 2, 4, 0};
@@ -157,7 +160,7 @@ public class LispMappingServiceTest {
         Mockito.when(tlsMapRequestMock.get()).thenReturn(pair);
 
         assertNull(lispMappingService.handleMapRequest(mapRequest));
-        Mockito.verify(odlLispSbService).sendMapRequest(smrib.build());
+        Mockito.verify(sendMapRequest).invoke(smrib.build());
     }
 
     /**
@@ -189,7 +192,7 @@ public class LispMappingServiceTest {
         Mockito.when(tlsMapNotifyMock.get()).thenReturn(getDefaultMapNotifyPair());
 
         lispMappingService.onAddMapping(addMapping);
-        Mockito.verify(odlLispSbService, Mockito.times(2)).sendMapNotify(Mockito.argThat(new TransportAddressMatch()));
+        Mockito.verify(sendMapNotify, Mockito.times(2)).invoke(Mockito.argThat(new TransportAddressMatch()));
     }
 
     /**
@@ -214,7 +217,7 @@ public class LispMappingServiceTest {
                 .setTransportAddress(TRANSPORT_ADDRESS);
 
         lispMappingService.onAddMapping(addMapping);
-        Mockito.verify(odlLispSbService).sendMapNotify(smnib.build());
+        Mockito.verify(sendMapNotify).invoke(smnib.build());
     }
 
     /**
@@ -238,7 +241,7 @@ public class LispMappingServiceTest {
                 .setTransportAddress(TRANSPORT_ADDRESS_1);
 
         lispMappingService.onRequestMapping(requestMapping);
-        Mockito.verify(odlLispSbService).sendMapReply(smrib.build());
+        Mockito.verify(sendMapReply).invoke(smrib.build());
     }
 
     /**
@@ -255,7 +258,7 @@ public class LispMappingServiceTest {
         Mockito.when(tlsMapReplyMock.get()).thenReturn(null);
 
         lispMappingService.onRequestMapping(requestMapping);
-        Mockito.verifyZeroInteractions(odlLispSbService);
+        Mockito.verifyZeroInteractions(sendMapReply);
     }
 
     /**
@@ -288,7 +291,7 @@ public class LispMappingServiceTest {
                 .setTransportAddress(TRANSPORT_ADDRESS);
 
         lispMappingService.handleSMR(mapRequest, subscriber);
-        Mockito.verify(odlLispSbService).sendMapRequest(smrib.build());
+        Mockito.verify(sendMapRequest).invoke(smrib.build());
     }
 
     /**
@@ -345,11 +348,9 @@ public class LispMappingServiceTest {
      */
     @Test
     public void closeTest() throws Exception {
-        setMock("rpcRegistration", rpcRegistration);
         setMock("listenerRegistration", listenerRegistration);
         setMock("cssRegistration", cssRegistration);
         lispMappingService.close();
-        Mockito.verify(rpcRegistration).close();
         Mockito.verify(listenerRegistration).close();
         Mockito.verify(cssRegistration).close();
         assertNull(getField("mapResolver"));
@@ -381,7 +382,7 @@ public class LispMappingServiceTest {
     }
 
     @SuppressWarnings("unchecked")
-    private <T> T getField(String fieldName) throws NoSuchFieldException, IllegalAccessException {
+    private <T> T getField(final String fieldName) throws NoSuchFieldException, IllegalAccessException {
         final Field field = LispMappingService.class.getDeclaredField(fieldName);
         field.setAccessible(true);
 
@@ -413,10 +414,10 @@ public class LispMappingServiceTest {
                 .setTimestamp(TIMESTAMP).build();
     }
 
-    class TransportAddressMatch implements ArgumentMatcher<SendMapNotifyInput> {
+    static class TransportAddressMatch implements ArgumentMatcher<SendMapNotifyInput> {
         @Override
-        public boolean matches(SendMapNotifyInput sendMapNotify) {
-            final TransportAddress notifyTransportAddress = sendMapNotify.getTransportAddress();
+        public boolean matches(final SendMapNotifyInput argument) {
+            final TransportAddress notifyTransportAddress = argument.getTransportAddress();
             return TRANSPORT_ADDRESS_1.equals(notifyTransportAddress)
                     || TRANSPORT_ADDRESS_2.equals(notifyTransportAddress);
         }