Fix bad imports

[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 5c78e67ee5cd0b7327bf202ed7d93f859d080840..85b51d7cbf842a9e2ed1f9332b7498aa6997bbc8 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,6 +11,7 @@ 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;
@@ -19,6 +20,7 @@ import org.opendaylight.mdsal.binding.api.RpcProviderService;
 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.listeners.ServiceListener;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.test.AbstractTest;
 
@@ -33,6 +35,9 @@ public class ServicehandlerProviderTest  extends AbstractTest {
     @Mock
     PceListenerImpl pceListenerImpl;
 
+    @Mock
+    ServiceListener serviceListener;
+
     @Mock
     RendererListenerImpl rendererListenerImpl;
 
@@ -42,18 +47,20 @@ public class ServicehandlerProviderTest  extends AbstractTest {
     @Mock
     ServicehandlerImpl servicehandler;
 
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
 
+    private AutoCloseable closeable;
+
+    @Before
+    public void openMocks() {
+        closeable = MockitoAnnotations.openMocks(this);
     }
 
     @Test
     public void testInitRegisterServiceHandlerToRpcRegistry() {
         ServicehandlerProvider provider =  new ServicehandlerProvider(
                 getDataBroker(), rpcProviderRegistry,
-                getNotificationService() , serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl,
-                networkModelListenerImpl, servicehandler);
+                getNotificationService() , serviceDataStoreOperations, pceListenerImpl, serviceListener,
+                rendererListenerImpl, networkModelListenerImpl, servicehandler);
 
         provider.init();
 
@@ -61,8 +68,8 @@ public class ServicehandlerProviderTest  extends AbstractTest {
                 .registerRpcImplementation(any(), any(ServicehandlerImpl.class));
     }
 
-
-
-
+    @After public void releaseMocks() throws Exception {
+        closeable.close();
+    }
 
 }