X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Fprovider%2FTapiProviderTest.java;h=76077e6fb6ffe52686f9091cab8da49686570a79;hb=ee81f24e14686bfb96cfa404592ad89117c01aa7;hp=878c7633ed23281f0ab0d3d910fd0c3f4446bf59;hpb=cf3a29d3e9f11331a9cab1a4dc59b0e0d96ac9c0;p=transportpce.git

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
index 878c7633e..76077e6fb 100644
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
@@ -11,96 +11,77 @@ 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.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.tapi.impl.TapiProvider;
+import org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelListenerImpl;
 import org.opendaylight.transportpce.tapi.listeners.TapiPceListenerImpl;
 import org.opendaylight.transportpce.tapi.listeners.TapiRendererListenerImpl;
 import org.opendaylight.transportpce.tapi.listeners.TapiServiceHandlerListenerImpl;
 import org.opendaylight.transportpce.tapi.topology.TapiNetconfTopologyListener;
+import org.opendaylight.transportpce.tapi.topology.TapiOrLinkListener;
 import org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener;
 import org.opendaylight.transportpce.tapi.utils.TapiListener;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TapiCommonService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.TapiConnectivityService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.TapiTopologyService;
 
+@ExtendWith(MockitoExtension.class)
 public class TapiProviderTest extends AbstractTest {
-    public static NetworkTransactionService networkTransactionService;
+    private static NetworkTransactionService networkTransactionService;
 
     @Mock
-    RpcProviderService rpcProviderRegistry;
-
+    private RpcProviderService rpcProviderRegistry;
     @Mock
-    OrgOpenroadmServiceService serviceHandler;
-
+    private OrgOpenroadmServiceService serviceHandler;
     @Mock
-    ServiceDataStoreOperations serviceDataStoreOperations;
-
+    private ServiceDataStoreOperations serviceDataStoreOperations;
     @Mock
-    TapiListener tapiListener;
-
+    private TapiListener tapiListener;
     @Mock
-    TransportpceTapinetworkutilsService tapiNetworkUtils;
-
+    private TransportpceTapinetworkutilsService tapiNetworkUtils;
     @Mock
-    TapiPortMappingListener tapiPortMappingListener;
-
+    private TapiPortMappingListener tapiPortMappingListener;
     @Mock
-    TapiNetconfTopologyListener topologyListener;
-
+    private TapiNetconfTopologyListener topologyListener;
     @Mock
-    TapiPceListenerImpl pceListenerImpl;
-
+    private TapiOrLinkListener orLinkListener;
     @Mock
-    TapiRendererListenerImpl rendererListenerImpl;
-
+    private TapiPceListenerImpl pceListenerImpl;
+    @Mock
+    private TapiRendererListenerImpl rendererListenerImpl;
     @Mock
-    TapiServiceHandlerListenerImpl serviceHandlerListenerImpl;
+    private TapiServiceHandlerListenerImpl serviceHandlerListenerImpl;
+    @Mock
+    private TapiNetworkModelListenerImpl networkModelListener;
 
-    private AutoCloseable closeable;
 
-    @Before
-    public void openMocks() {
-        closeable = MockitoAnnotations.openMocks(this);
-    }
-
-    @BeforeClass
-    public static void setUp() {
-        networkTransactionService = new NetworkTransactionImpl(
-            new RequestProcessor(getDataBroker()));
+    @BeforeAll
+    static void setUp() {
+        networkTransactionService = new NetworkTransactionImpl(getDataBroker());
     }
 
     @Test
-    public void testInitRegisterTapiToRpcRegistry() {
+    void testInitRegisterTapiToRpcRegistry() {
         TapiProvider provider =  new TapiProvider(getDataBroker(), rpcProviderRegistry, serviceHandler,
             serviceDataStoreOperations, tapiListener, networkTransactionService, topologyListener,
             tapiPortMappingListener, tapiNetworkUtils, pceListenerImpl, rendererListenerImpl,
-            serviceHandlerListenerImpl, getNotificationService());
+            serviceHandlerListenerImpl, getNotificationService(), orLinkListener, networkModelListener);
 
         provider.init();
 
-        verify(rpcProviderRegistry, times(1))
-            .registerRpcImplementation(any(), any(TapiConnectivityService.class));
-        verify(rpcProviderRegistry, times(2))
-            .registerRpcImplementation(any(), any(TapiTopologyService.class));
-        verify(rpcProviderRegistry, times(2))
-            .registerRpcImplementation(any(), any(TapiCommonService.class));
-    }
-
-    @After
-    public void releaseMocks() throws Exception {
-        closeable.close();
+        verify(rpcProviderRegistry, times(1)).registerRpcImplementation(any(), any(TapiConnectivityService.class));
+        verify(rpcProviderRegistry, times(2)).registerRpcImplementation(any(), any(TapiTopologyService.class));
+        verify(rpcProviderRegistry, times(2)).registerRpcImplementation(any(), any(TapiCommonService.class));
     }
-}
+}
\ No newline at end of file