Bump upstreams

[bgpcep.git] / programming / impl / src / test / java / org / opendaylight / bgpcep / programming / impl / AbstractProgrammingTest.java

diff --git a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java
index a6eb2482c575fe8b57e33cadb76badf99ca4a7db..b82b0e4a003701eb3dc13fc76ec6e23064297c1c 100644 (file)
--- a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java
+++ b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/AbstractProgrammingTest.java
@@ -11,17 +11,14 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.MockitoAnnotations.initMocks;
 
 import org.junit.Before;
 import org.mockito.Mock;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.programming.rev150720.ProgrammingService;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
+import org.opendaylight.yangtools.concepts.Registration;
 
 abstract class AbstractProgrammingTest extends AbstractConcurrentDataBrokerTest {
     @Mock
@@ -29,9 +26,9 @@ abstract class AbstractProgrammingTest extends AbstractConcurrentDataBrokerTest
     @Mock
     ClusterSingletonServiceProvider cssp;
     @Mock
-    ClusterSingletonServiceRegistration singletonServiceRegistration;
+    Registration singletonServiceRegistration;
     @Mock
-    private ObjectRegistration<ProgrammingService> registration;
+    private Registration registration;
     ClusterSingletonService singletonService;
 
     AbstractProgrammingTest() {
@@ -40,19 +37,17 @@ abstract class AbstractProgrammingTest extends AbstractConcurrentDataBrokerTest
 
     @Before
     public void setUp() throws Exception {
-        initMocks(this);
         doAnswer(invocationOnMock -> {
-            this.singletonService = (ClusterSingletonService) invocationOnMock.getArguments()[0];
-            return this.singletonServiceRegistration;
-        }).when(this.cssp).registerClusterSingletonService(any(ClusterSingletonService.class));
+            singletonService = invocationOnMock.getArgument(0);
+            return singletonServiceRegistration;
+        }).when(cssp).registerClusterSingletonService(any(ClusterSingletonService.class));
         doAnswer(invocationOnMock -> {
-            this.singletonService.closeServiceInstance().get();
+            singletonService.closeServiceInstance().get();
             return null;
-        }).when(this.singletonServiceRegistration).close();
+        }).when(singletonServiceRegistration).close();
 
-        doReturn(this.registration).when(this.rpcRegistry).registerRpcImplementation(any(),
-            any(ProgrammingService.class));
+        doReturn(registration).when(rpcRegistry).registerRpcImplementations(any());
 
-        doNothing().when(this.registration).close();
+        doNothing().when(registration).close();
     }
 }