Migrate servicehandler module to JUnit5

[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / listeners / NetworkModelListenerImplTest.java

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/listeners/NetworkModelListenerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/listeners/NetworkModelListenerImplTest.java
index 396efb90e3b8ffa52f0ca850c026272d7cbf0bd1..53b58a93e8250860ee847728bd1eb71ccc4653d3 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/listeners/NetworkModelListenerImplTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/listeners/NetworkModelListenerImplTest.java
@@ -8,9 +8,9 @@
 
 package org.opendaylight.transportpce.servicehandler.listeners;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doCallRealMethod;
@@ -23,12 +23,12 @@ import static org.mockito.Mockito.when;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.transportpce.common.OperationResult;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
@@ -59,7 +59,7 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePathsBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePathsKey;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class NetworkModelListenerImplTest {
 
     @Mock
@@ -69,8 +69,8 @@ public class NetworkModelListenerImplTest {
     private static PathDescription pathDescription;
     private NetworkModelListenerImpl networkModelListener;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         pathDescription = new PathDescriptionBuilder()
                 .setAToZDirection(new AToZDirectionBuilder().setAToZ(new HashMap<>(createMapAtoZ())).build())
                 .setZToADirection(new ZToADirectionBuilder().setZToA(new HashMap<>(createMapZtoA())).build())
@@ -80,7 +80,7 @@ public class NetworkModelListenerImplTest {
     }
 
     @Test
-    public void testChangePathElementStateZAShouldNotModifyPathDescriptionsElementStates() {
+    void testChangePathElementStateZAShouldNotModifyPathDescriptionsElementStates() {
         Map<TopologyChangesKey, TopologyChanges> topologyChanges = Map.of(
                 new TopologyChangesKey("tpNodeIdA", "TpIdA1"),
                 new TopologyChangesBuilder()
@@ -96,12 +96,13 @@ public class NetworkModelListenerImplTest {
                         .build()
         );
 
-        assertEquals(pathDescription.getZToADirection().getZToA(),
-                networkModelListener.changePathElementStateZA(topologyChanges, pathDescription));
+        assertEquals(
+            pathDescription.getZToADirection().getZToA(),
+            networkModelListener.changePathElementStateZA(topologyChanges, pathDescription));
     }
 
     @Test
-    public void testChangePathElementStateZAShouldModifyPathDescriptionsElementStates() {
+    void testChangePathElementStateZAShouldModifyPathDescriptionsElementStates() {
         Map<TopologyChangesKey, TopologyChanges> topologyChanges = Map.of(
                 new TopologyChangesKey("tpNodeIdA", "TpIdA1"),
                 new TopologyChangesBuilder()
@@ -135,7 +136,7 @@ public class NetworkModelListenerImplTest {
     }
 
     @Test
-    public void testChangePathElementStateAZShouldNotModifyPathDescriptionsElementStates() {
+    void testChangePathElementStateAZShouldNotModifyPathDescriptionsElementStates() {
         Map<TopologyChangesKey, TopologyChanges> topologyChanges = Map.of(
                 new TopologyChangesKey("tpNodeIdA", "TpIdA1"),
                 new TopologyChangesBuilder()
@@ -150,12 +151,13 @@ public class NetworkModelListenerImplTest {
                         .setState(State.InService)
                         .build());
 
-        assertEquals(pathDescription.getAToZDirection().getAToZ(),
-                networkModelListener.changePathElementStateAZ(topologyChanges, pathDescription));
+        assertEquals(
+            pathDescription.getAToZDirection().getAToZ(),
+            networkModelListener.changePathElementStateAZ(topologyChanges, pathDescription));
     }
 
     @Test
-    public void testChangePathElementStateAZShouldModifyPathDescriptionsElementStates() {
+    void testChangePathElementStateAZShouldModifyPathDescriptionsElementStates() {
         Map<TopologyChangesKey, TopologyChanges> topologyChanges = Map.of(
                 new TopologyChangesKey("tpNodeIdA", "TpIdA1"),
                 new TopologyChangesBuilder()
@@ -189,7 +191,7 @@ public class NetworkModelListenerImplTest {
     }
 
     @Test
-    public void testAllElementsinPathinServiceShouldReturnFalse() {
+    void testAllElementsinPathinServiceShouldReturnFalse() {
         Map<AToZKey, AToZ> atozmap = pathDescription.getAToZDirection().getAToZ();
         atozmap.computeIfPresent(
                 new AToZKey("0"),
@@ -210,28 +212,29 @@ public class NetworkModelListenerImplTest {
     }
 
     @Test
-    public void testAllElementsinPathinServiceShouldReturnTrue() {
+    void testAllElementsinPathinServiceShouldReturnTrue() {
         assertTrue(networkModelListener.allElementsinPathinService(pathDescription.getAToZDirection().getAToZ(),
                 pathDescription.getZToADirection().getZToA()));
     }
 
     @Test
-    public void testUpdateServicePathsShouldNotModifyServiceState() {
+    void testUpdateServicePathsShouldNotModifyServiceState() {
         Map<ServicePathsKey, ServicePaths> servicePathMap = Map.of(new ServicePathsKey("service-path 1"),
                 new ServicePathsBuilder()
                         .setServicePathName("service-path 1")
                         .setPathDescription(pathDescription)
                         .build());
 
-        when(serviceDataStoreOperations.getServicePaths()).thenReturn(Optional.of(new ServicePathListBuilder()
-                .setServicePaths(servicePathMap).build()));
+        when(serviceDataStoreOperations.getServicePaths())
+            .thenReturn(Optional.of(new ServicePathListBuilder().setServicePaths(servicePathMap).build()));
         when(serviceDataStoreOperations.modifyServicePath(any(PathDescription.class), anyString()))
-                .thenReturn(OperationResult.ok(""));
-        when(serviceDataStoreOperations.getService(anyString())).thenReturn(Optional.of(
-                new ServicesBuilder().setServiceName("serviceTest")
-                        .setOperationalState(State.InService)
-                        .setAdministrativeState(AdminStates.InService)
-                        .build()));
+            .thenReturn(OperationResult.ok(""));
+        when(serviceDataStoreOperations.getService(anyString()))
+            .thenReturn(Optional.of(new ServicesBuilder()
+                    .setServiceName("serviceTest")
+                    .setOperationalState(State.InService)
+                    .setAdministrativeState(AdminStates.InService)
+                    .build()));
 
         Map<TopologyChangesKey, TopologyChanges> topologyChanges = Map.of(
                 new TopologyChangesKey("tpNodeIdC", "TpIdC1"),
@@ -249,12 +252,12 @@ public class NetworkModelListenerImplTest {
 
         networkModelListener.updateServicePaths(new TopologyUpdateResultBuilder()
                 .setTopologyChanges(topologyChanges).build());
-        verify(serviceDataStoreOperations,
-                never()).modifyService(anyString(), any(State.class), any(AdminStates.class));
+        verify(serviceDataStoreOperations, never())
+            .modifyService(anyString(), any(State.class), any(AdminStates.class));
     }
 
     @Test
-    public void testUpdateServicePathsShouldModifyServiceState() {
+    void testUpdateServicePathsShouldModifyServiceState() {
         Map<ServicePathsKey, ServicePaths> servicePathMap = Map.of(
                 new ServicePathsKey("service-path 1"),
                 new ServicePathsBuilder()
@@ -262,17 +265,18 @@ public class NetworkModelListenerImplTest {
                         .setPathDescription(pathDescription)
                         .build());
 
-        when(serviceDataStoreOperations.getServicePaths()).thenReturn(Optional.of(new ServicePathListBuilder()
-                .setServicePaths(servicePathMap).build()));
+        when(serviceDataStoreOperations.getServicePaths())
+            .thenReturn(Optional.of(new ServicePathListBuilder().setServicePaths(servicePathMap).build()));
         when(serviceDataStoreOperations.modifyServicePath(any(PathDescription.class), anyString()))
-                .thenReturn(OperationResult.ok(""));
-        when(serviceDataStoreOperations.getService(anyString())).thenReturn(Optional.of(
-                new ServicesBuilder().setServiceName("serviceTest")
-                        .setOperationalState(State.InService)
-                        .setAdministrativeState(AdminStates.InService)
-                        .build()));
+            .thenReturn(OperationResult.ok(""));
+        when(serviceDataStoreOperations.getService(anyString()))
+            .thenReturn(Optional.of(new ServicesBuilder()
+                    .setServiceName("serviceTest")
+                    .setOperationalState(State.InService)
+                    .setAdministrativeState(AdminStates.InService)
+                    .build()));
         when(serviceDataStoreOperations.modifyService(anyString(), any(State.class), any(AdminStates.class)))
-                .thenReturn(OperationResult.ok(""));
+            .thenReturn(OperationResult.ok(""));
 
         Map<TopologyChangesKey, TopologyChanges> topologyChanges = Map.of(
                 new TopologyChangesKey("tpNodeIdA", "TpIdA1"),
@@ -284,12 +288,12 @@ public class NetworkModelListenerImplTest {
 
         networkModelListener.updateServicePaths(new TopologyUpdateResultBuilder()
                 .setTopologyChanges(topologyChanges).build());
-        verify(serviceDataStoreOperations, times(1)).modifyService(anyString(),
-                eq(State.OutOfService), any(AdminStates.class));
+        verify(serviceDataStoreOperations, times(1))
+            .modifyService(anyString(), eq(State.OutOfService), any(AdminStates.class));
     }
 
     @Test
-    public void testOnTopologyUpdateResultWhenNeverWired() {
+    void testOnTopologyUpdateResultWhenNeverWired() {
         NetworkModelListenerImpl networkModelListenerMocked = Mockito.mock(NetworkModelListenerImpl.class);
         doCallRealMethod().when(networkModelListenerMocked).onTopologyUpdateResult(any(TopologyUpdateResult.class));
 
@@ -312,12 +316,11 @@ public class NetworkModelListenerImplTest {
                 .setTopologyChanges(topologyChanges1).build());
         networkModelListenerMocked.onTopologyUpdateResult(new TopologyUpdateResultBuilder()
                 .setTopologyChanges(topologyChanges2).build());
-        verify(networkModelListenerMocked, times(2)).updateServicePaths(
-                any(TopologyUpdateResult.class));
+        verify(networkModelListenerMocked, times(2)).updateServicePaths(any(TopologyUpdateResult.class));
     }
 
     @Test
-    public void testOnTopologyUpdateResultWhenAlreadyWired() {
+    void testOnTopologyUpdateResultWhenAlreadyWired() {
         NetworkModelListenerImpl networkModelListenerMocked = Mockito.mock(NetworkModelListenerImpl.class);
         doCallRealMethod().when(networkModelListenerMocked).onTopologyUpdateResult(any(TopologyUpdateResult.class));
 
@@ -333,8 +336,7 @@ public class NetworkModelListenerImplTest {
 
         networkModelListenerMocked.onTopologyUpdateResult(topologyUpdateResult);
         networkModelListenerMocked.onTopologyUpdateResult(topologyUpdateResult);
-        verify(networkModelListenerMocked, times(1)).updateServicePaths(
-                any(TopologyUpdateResult.class));
+        verify(networkModelListenerMocked, times(1)).updateServicePaths(any(TopologyUpdateResult.class));
     }
 
     private Map<AToZKey, AToZ> createMapAtoZ() {