X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Flisteners%2FPortMappingListenerTest.java;h=a64179356429eb30ea8d06c5dedc2623ea2b7d9d;hb=b1b3bafd549bb501937cea5c976d5344608b6ed3;hp=50afef19a96efa8a9e38359f9a342c29ef5f97c2;hpb=6bc844fe96e1bd2ae991f5a1b2ad3f7446f87f10;p=transportpce.git

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListenerTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListenerTest.java
index 50afef19a..a64179356 100644
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListenerTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/listeners/PortMappingListenerTest.java
@@ -16,8 +16,8 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Collection;
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -27,7 +27,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.transportpce.networkmodel.service.NetworkModelService;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.mapping.Mapping;
 
 
 @ExtendWith(MockitoExtension.class)
@@ -45,7 +45,7 @@ public class PortMappingListenerTest {
 
     @Test
     void testOnDataTreeChangedWhenMappingOperAndAdminDidntChange() {
-        final Collection<DataTreeModification<Mapping>> changes = new HashSet<>();
+        final List<DataTreeModification<Mapping>> changes = new ArrayList<>();
         @SuppressWarnings("unchecked") final DataTreeModification<Mapping> ch = mock(DataTreeModification.class);
         changes.add(ch);
         @SuppressWarnings("unchecked") final DataObjectModification<Mapping> mappingObject =
@@ -54,8 +54,8 @@ public class PortMappingListenerTest {
         final Mapping newMapping = mock(Mapping.class);
 
         when(ch.getRootNode()).thenReturn(mappingObject);
-        when(mappingObject.getDataBefore()).thenReturn(oldMapping);
-        when(mappingObject.getDataAfter()).thenReturn(newMapping);
+        when(mappingObject.dataBefore()).thenReturn(oldMapping);
+        when(mappingObject.dataAfter()).thenReturn(newMapping);
         when(oldMapping.getPortAdminState()).thenReturn("InService");
         when(oldMapping.getPortOperState()).thenReturn("InService");
         when(newMapping.getPortAdminState()).thenReturn("InService");
@@ -67,7 +67,7 @@ public class PortMappingListenerTest {
 
     @Test
     void testOnDataTreeChangedWhenMappingAdminChanged() {
-        final Collection<DataTreeModification<Mapping>> changes = new HashSet<>();
+        final List<DataTreeModification<Mapping>> changes = new ArrayList<>();
         @SuppressWarnings("unchecked") final DataTreeModification<Mapping> ch = mock(DataTreeModification.class);
         changes.add(ch);
         @SuppressWarnings("unchecked") final DataObjectModification<Mapping> mappingObject =
@@ -76,8 +76,8 @@ public class PortMappingListenerTest {
         final Mapping newMapping = mock(Mapping.class);
 
         when(ch.getRootNode()).thenReturn(mappingObject);
-        when(mappingObject.getDataBefore()).thenReturn(oldMapping);
-        when(mappingObject.getDataAfter()).thenReturn(newMapping);
+        when(mappingObject.dataBefore()).thenReturn(oldMapping);
+        when(mappingObject.dataAfter()).thenReturn(newMapping);
         when(oldMapping.getPortAdminState()).thenReturn("InService");
         when(newMapping.getPortAdminState()).thenReturn("OutOfService");
 
@@ -87,7 +87,7 @@ public class PortMappingListenerTest {
 
     @Test
     void testOnDataTreeChangedWhenMappingOperChanged() {
-        final Collection<DataTreeModification<Mapping>> changes = new HashSet<>();
+        final List<DataTreeModification<Mapping>> changes = new ArrayList<>();
         @SuppressWarnings("unchecked") final DataTreeModification<Mapping> ch = mock(DataTreeModification.class);
         changes.add(ch);
         @SuppressWarnings("unchecked") final DataObjectModification<Mapping> mappingObject =
@@ -96,8 +96,8 @@ public class PortMappingListenerTest {
         final Mapping newMapping = mock(Mapping.class);
 
         when(ch.getRootNode()).thenReturn(mappingObject);
-        when(mappingObject.getDataBefore()).thenReturn(oldMapping);
-        when(mappingObject.getDataAfter()).thenReturn(newMapping);
+        when(mappingObject.dataBefore()).thenReturn(oldMapping);
+        when(mappingObject.dataAfter()).thenReturn(newMapping);
         when(oldMapping.getPortAdminState()).thenReturn("InService");
         when(oldMapping.getPortOperState()).thenReturn("InService");
         when(newMapping.getPortAdminState()).thenReturn("InService");