*/
package org.opendaylight.transportpce.tapi.connectivity;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opendaylight.mdsal.binding.api.NotificationPublishService;
import org.opendaylight.transportpce.common.InstanceIdentifiers;
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.pce.service.PathComputationService;
import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations;
import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.DeleteConnectivityServiceInput;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.DeleteConnectivityServiceInputBuilder;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.DeleteConnectivityServiceOutput;
-import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.common.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@ExtendWith(MockitoExtension.class)
public class TapiConnectivityImplTest extends AbstractTest {
@Mock
private PathComputationService pathComputationService;
-
@Mock
private RendererServiceOperations rendererServiceOperations;
-
@Mock
private NotificationPublishService notificationPublishService;
-
@Mock
private TapiPceListenerImpl tapipceListenerImpl;
-
@Mock
private TapiRendererListenerImpl tapirendererListenerImpl;
-
@Mock
private TapiServiceHandlerListenerImpl tapiserviceHandlerListenerImpl;
-
@Mock
private PceListenerImpl pceListenerImpl;
-
@Mock
private RendererListenerImpl rendererListenerImpl;
-
@Mock
private NetworkModelListenerImpl networkModelListenerImpl;
private static final Logger LOG = LoggerFactory.getLogger(TapiConnectivityImplTest.class);
- public static ServiceDataStoreOperations serviceDataStoreOperations;
- public static TapiContext tapiContext;
- public static TopologyUtils topologyUtils;
- public static ConnectivityUtils connectivityUtils;
- public static TapiInitialORMapping tapiInitialORMapping;
- public static NetworkTransactionService networkTransactionService;
- public static TapiLink tapilink;
+ private static ServiceDataStoreOperations serviceDataStoreOperations;
+ private static TapiContext tapiContext;
+ private static TopologyUtils topologyUtils;
+ private static ConnectivityUtils connectivityUtils;
+ private static TapiInitialORMapping tapiInitialORMapping;
+ private static NetworkTransactionService networkTransactionService;
+ private static TapiLink tapilink;
private ListeningExecutorService executorService;
private CountDownLatch endSignal;
private static final int NUM_THREADS = 5;
- @Before
- public void setUp() throws InterruptedException, ExecutionException {
+ @BeforeEach
+ void setUp() throws InterruptedException, ExecutionException {
executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS));
endSignal = new CountDownLatch(1);
// Need to have datastore populated to enable the mapping from TAPI to OR
TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil(),
TapiTopologyDataUtils.PORTMAPPING_FILE);
- MockitoAnnotations.openMocks(this);
-
- networkTransactionService = new NetworkTransactionImpl(
- new RequestProcessor(getDataStoreContextUtil().getDataBroker()));
+ networkTransactionService = new NetworkTransactionImpl(getDataBroker());
tapilink = new TapiLink(networkTransactionService);
serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(getDataStoreContextUtil().getDataBroker());
tapiContext = new TapiContext(networkTransactionService);
}
@Test
- public void createConnServiceShouldBeFailedWithEmptyInput() throws ExecutionException, InterruptedException {
+ void createConnServiceShouldBeFailedWithEmptyInput() throws ExecutionException, InterruptedException {
OrgOpenroadmServiceService serviceHandler = new ServicehandlerImpl(getNewDataBroker(), pathComputationService,
rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl,
networkModelListenerImpl, serviceDataStoreOperations);
TapiConnectivityImpl tapiConnectivity = new TapiConnectivityImpl(serviceHandler, tapiContext, connectivityUtils,
- tapipceListenerImpl, tapirendererListenerImpl, tapiserviceHandlerListenerImpl);
+ tapipceListenerImpl, tapirendererListenerImpl);
ListenableFuture<RpcResult<CreateConnectivityServiceOutput>> result =
tapiConnectivity.createConnectivityService(new CreateConnectivityServiceInputBuilder().build());
endSignal.await();
RpcResult<CreateConnectivityServiceOutput> rpcResult = result.get();
- Assert.assertEquals(
- RpcError.ErrorType.RPC, rpcResult.getErrors().get(0).getErrorType());
+ assertEquals(ErrorType.RPC, rpcResult.getErrors().get(0).getErrorType());
}
@Test
- public void createConnServiceShouldBeSuccessfulWhenPerformPCESuccessful()
+ void createConnServiceShouldBeSuccessfulWhenPerformPCESuccessful()
throws ExecutionException, InterruptedException {
OrgOpenroadmServiceService serviceHandler = new ServicehandlerImpl(getNewDataBroker(), pathComputationService,
rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl,
networkModelListenerImpl, serviceDataStoreOperations);
CreateConnectivityServiceInput input = TapiConnectivityDataUtils.buildConnServiceCreateInput();
- Mockito.when(pathComputationService.pathComputationRequest(any())).thenReturn(Futures.immediateFuture(any()));
+ when(pathComputationService.pathComputationRequest(any())).thenReturn(Futures.immediateFuture(any()));
TapiConnectivityImpl tapiConnectivity = new TapiConnectivityImpl(serviceHandler, tapiContext, connectivityUtils,
- tapipceListenerImpl, tapirendererListenerImpl, tapiserviceHandlerListenerImpl);
+ tapipceListenerImpl, tapirendererListenerImpl);
ListenableFuture<RpcResult<CreateConnectivityServiceOutput>> result =
tapiConnectivity.createConnectivityService(input);
result.addListener(new Runnable() {
endSignal.await();
RpcResult<CreateConnectivityServiceOutput> rpcResult = result.get();
- Assert.assertTrue(rpcResult.isSuccessful());
+ assertTrue(rpcResult.isSuccessful());
}
@Test
- public void deleteConnServiceShouldBeFailedWithEmptyInput() throws ExecutionException, InterruptedException {
+ void deleteConnServiceShouldBeFailedWithEmptyInput() throws ExecutionException, InterruptedException {
OrgOpenroadmServiceService serviceHandler = new ServicehandlerImpl(getNewDataBroker(), pathComputationService,
rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl,
networkModelListenerImpl, serviceDataStoreOperations);
TapiConnectivityImpl tapiConnectivity = new TapiConnectivityImpl(serviceHandler, tapiContext, connectivityUtils,
- tapipceListenerImpl, tapirendererListenerImpl, tapiserviceHandlerListenerImpl);
+ tapipceListenerImpl, tapirendererListenerImpl);
ListenableFuture<RpcResult<DeleteConnectivityServiceOutput>> result =
tapiConnectivity.deleteConnectivityService(new DeleteConnectivityServiceInputBuilder().build());
endSignal.await();
RpcResult<DeleteConnectivityServiceOutput> rpcResult = result.get();
- Assert.assertEquals(
- RpcError.ErrorType.RPC, rpcResult.getErrors().get(0).getErrorType());
+ assertEquals(ErrorType.RPC, rpcResult.getErrors().get(0).getErrorType());
}
@Test
- public void deleteConnServiceShouldBeFailedWithNonExistService() throws ExecutionException, InterruptedException {
+ void deleteConnServiceShouldBeFailedWithNonExistService() throws ExecutionException, InterruptedException {
DeleteConnectivityServiceInput input = TapiConnectivityDataUtils.buildConnServiceDeleteInput1();
OrgOpenroadmServiceService serviceHandler = new ServicehandlerImpl(getNewDataBroker(), pathComputationService,
rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl,
networkModelListenerImpl, serviceDataStoreOperations);
TapiConnectivityImpl tapiConnectivity = new TapiConnectivityImpl(serviceHandler, tapiContext, connectivityUtils,
- tapipceListenerImpl, tapirendererListenerImpl, tapiserviceHandlerListenerImpl);
+ tapipceListenerImpl, tapirendererListenerImpl);
ListenableFuture<RpcResult<DeleteConnectivityServiceOutput>> result =
tapiConnectivity.deleteConnectivityService(input);
result.addListener(new Runnable() {
endSignal.await();
RpcResult<DeleteConnectivityServiceOutput> rpcResult = result.get();
- Assert.assertEquals(
- RpcError.ErrorType.RPC, rpcResult.getErrors().get(0).getErrorType());
+ assertEquals(ErrorType.RPC, rpcResult.getErrors().get(0).getErrorType());
}
@Test
- public void deleteConnServiceShouldBeSuccessForExistingService() throws ExecutionException, InterruptedException {
- Mockito.when(rendererServiceOperations.serviceDelete(any(), any())).thenReturn(Futures.immediateFuture(any()));
+ void deleteConnServiceShouldBeSuccessForExistingService() throws ExecutionException, InterruptedException {
+ when(rendererServiceOperations.serviceDelete(any(), any())).thenReturn(Futures.immediateFuture(any()));
OrgOpenroadmServiceService serviceHandler = new ServicehandlerImpl(getNewDataBroker(), pathComputationService,
rendererServiceOperations, notificationPublishService, pceListenerImpl, rendererListenerImpl,
networkModelListenerImpl, serviceDataStoreOperations);
TapiConnectivityImpl tapiConnectivity = new TapiConnectivityImpl(serviceHandler, tapiContext, connectivityUtils,
- tapipceListenerImpl, tapirendererListenerImpl, tapiserviceHandlerListenerImpl);
+ tapipceListenerImpl, tapirendererListenerImpl);
ServiceCreateInput createInput = TapiConnectivityDataUtils.buildServiceCreateInput();
serviceDataStoreOperations.createService(createInput);
endSignal.await();
RpcResult<DeleteConnectivityServiceOutput> rpcResult = result.get();
- Assert.assertTrue(rpcResult.isSuccessful());
+ assertTrue(rpcResult.isSuccessful());
}
-}
+}
\ No newline at end of file
Code Review / transportpce.git / blobdiff