X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fimpl%2FPceProviderTest.java;h=0245310d087b0cdd48c24d830f6cdaa38782af1b;hb=015fe34f3b1b909a6e7167c63c1a609832dcab45;hp=b04a75adf70936e6f3b53bba9648542a325e61db;hpb=2e0247e7db43b00fcaf2b61f86d9088b60737265;p=transportpce.git

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java
index b04a75adf..0245310d0 100644
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java
@@ -8,67 +8,30 @@
 
 package org.opendaylight.transportpce.pce.impl;
 
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.eq;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+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.RequestProcessor;
 import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.transportpce.pce.service.PathComputationServiceImpl;
-import org.opendaylight.transportpce.pce.utils.NotificationPublishServiceMock;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.TransportpcePceService;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
-
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.TransportpcePceService;
 
+@ExtendWith(MockitoExtension.class)
 public class PceProviderTest extends AbstractTest {
 
+    @Mock
     private RpcProviderService rpcService;
+    @Mock
     private PathComputationService pathComputationService;
-    private NotificationPublishService notificationPublishService;
-    private NetworkTransactionImpl networkTransaction;
-    private RequestProcessor requestProcessor;
-    private ObjectRegistration<TransportpcePceService> rpcRegistration;
-    private PceProvider pceProvider;
-
-    @Before
-    public void setUp() {
-        rpcService = Mockito.mock(RpcProviderService.class);
-        notificationPublishService = new NotificationPublishServiceMock();
-        requestProcessor = Mockito.mock(RequestProcessor.class);
-        networkTransaction = new NetworkTransactionImpl(requestProcessor);
-        pathComputationService = new PathComputationServiceImpl(networkTransaction, notificationPublishService);
-        pceProvider = new PceProvider(rpcService, pathComputationService);
-    }
 
     @Test
-    public void testInit() {
-        this.rpcRegistration = new ObjectRegistration<TransportpcePceService>() {
-            @NonNull
-            @Override
-            public TransportpcePceService getInstance() {
-                return new PceServiceRPCImpl(pathComputationService);
-            }
-
-            @Override
-            public void close() {
-
-            }
-        };
-
-
-        Mockito
-                .when(rpcService
-                        .registerRpcImplementation(eq(TransportpcePceService.class), anyObject()))
-                .thenReturn(rpcRegistration);
-        pceProvider.init();
-        pceProvider.close();
+    void testInit() {
+        new PceProvider(rpcService, pathComputationService);
+        verify(rpcService, times(1)).registerRpcImplementation(any(), any(TransportpcePceService.class));
     }
-
 }