Fix Mockito initMocks deprecation warnings

[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / impl / ServicehandlerProviderTest.java

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
index 4c3b66b84698d863940b5f7b3f1c6dda38f69fb4..e458df832683dc7bf58b06f801ff9785c30d36c5 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
@@ -11,47 +11,51 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService;
-import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
+import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl;
+import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl;
+import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.test.AbstractTest;
 
 public class ServicehandlerProviderTest  extends AbstractTest {
 
     @Mock
-    private PathComputationService pathComputationService;
+    RpcProviderService rpcProviderRegistry;
 
     @Mock
-    private RendererServiceOperations rendererServiceOperations;
+    ServiceDataStoreOperations serviceDataStoreOperations;
 
     @Mock
-    private NotificationPublishService notificationPublishService;
+    PceListenerImpl pceListenerImpl;
 
     @Mock
-    RpcProviderService rpcProviderRegistry;
+    RendererListenerImpl rendererListenerImpl;
 
     @Mock
-    NetworkModelWavelengthService networkModelWavelengthService;
+    NetworkModelListenerImpl networkModelListenerImpl;
 
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
+    @Mock
+    ServicehandlerImpl servicehandler;
+
+    private AutoCloseable closeable;
 
+    @Before
+    public void openMocks() {
+        closeable = MockitoAnnotations.openMocks(this);
     }
 
     @Test
     public void testInitRegisterServiceHandlerToRpcRegistry() {
         ServicehandlerProvider provider =  new ServicehandlerProvider(
                 getDataBroker(), rpcProviderRegistry,
-                getNotificationService() , pathComputationService,
-                rendererServiceOperations, networkModelWavelengthService,
-                notificationPublishService);
+                getNotificationService() , serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl,
+                networkModelListenerImpl, servicehandler);
 
         provider.init();
 
@@ -59,8 +63,8 @@ public class ServicehandlerProviderTest  extends AbstractTest {
                 .registerRpcImplementation(any(), any(ServicehandlerImpl.class));
     }
 
-
-
-
+    @After public void releaseMocks() throws Exception {
+        closeable.close();
+    }
 
 }