X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FNetConfTopologyListenerTest.java;h=7dbc8601d6ce8e52defce5061f43d86c6aa101b4;hb=6bc844fe96e1bd2ae991f5a1b2ad3f7446f87f10;hp=4e8a5e908b6270d91c5df7b6d2d8ad65bbb20c56;hpb=c9204fb5ecb0e5d842a9bc843198bbea6728bd57;p=transportpce.git diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java index 4e8a5e908..7dbc8601d 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java @@ -21,10 +21,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataTreeModification; @@ -36,14 +36,14 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilities; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilitiesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapabilityBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilities; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapabilityBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; @@ -51,7 +51,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; -@RunWith(MockitoJUnitRunner.StrictStubs.class) +@ExtendWith(MockitoExtension.class) public class NetConfTopologyListenerTest { @Mock @@ -66,19 +66,18 @@ public class NetConfTopologyListenerTest { private Map registrations; @Test - public void testOnDataTreeChangedWhenDeleteNode() { - final DataObjectModification node = mock(DataObjectModification.class); + void testOnDataTreeChangedWhenDeleteNode() { + @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); final Collection> changes = new HashSet<>(); - final DataTreeModification ch = mock(DataTreeModification.class); + @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); final NodeRegistration nodeRegistration = mock(NodeRegistration.class); changes.add(ch); when(ch.getRootNode()).thenReturn(node); - final Node netconfNode = getNetconfNode("netconfNode1", NetconfNodeConnectionStatus.ConnectionStatus.Connecting, + final Node netconfNode = getNetconfNode("netconfNode1", ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.DELETE); when(node.getDataBefore()).thenReturn(netconfNode); - when(registrations.remove(anyString())).thenReturn(nodeRegistration); NetConfTopologyListener listener = new NetConfTopologyListener(networkModelService, dataBroker, deviceTransactionManager, portMapping, registrations); @@ -87,21 +86,21 @@ public class NetConfTopologyListenerTest { verify(node, times(1)).getModificationType(); verify(node, times(3)).getDataBefore(); verify(networkModelService, times(1)).deleteOpenRoadmnode(anyString()); - verify(nodeRegistration, times(1)).unregisterListeners(); + verify(nodeRegistration, times(0)).unregisterListeners(); } @Test - public void testOnDataTreeChangedWhenAddNode() { - final DataObjectModification node = mock(DataObjectModification.class); + void testOnDataTreeChangedWhenAddNode() { + @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); final Collection> changes = new HashSet<>(); @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); changes.add(ch); when(ch.getRootNode()).thenReturn(node); final Node netconfNodeBefore = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); final Node netconfNodeAfter = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); when(node.getDataBefore()).thenReturn(netconfNodeBefore); when(node.getDataAfter()).thenReturn(netconfNodeAfter); @@ -117,17 +116,17 @@ public class NetConfTopologyListenerTest { } @Test - public void testOnDataTreeChangedWhenDisconnectingNode() { - final DataObjectModification node = mock(DataObjectModification.class); + void testOnDataTreeChangedWhenDisconnectingNode() { + @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); final Collection> changes = new HashSet<>(); - final DataTreeModification ch = mock(DataTreeModification.class); + @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); changes.add(ch); when(ch.getRootNode()).thenReturn(node); final Node netconfNodeBefore = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); final Node netconfNodeAfter = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); when(node.getDataBefore()).thenReturn(netconfNodeBefore); when(node.getDataAfter()).thenReturn(netconfNodeAfter); @@ -144,15 +143,15 @@ public class NetConfTopologyListenerTest { } @Test - public void testOnDataTreeChangedWhenShouldNeverHappen() { - final DataObjectModification node = mock(DataObjectModification.class); + void testOnDataTreeChangedWhenShouldNeverHappen() { + @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); final Collection> changes = new HashSet<>(); - final DataTreeModification ch = mock(DataTreeModification.class); + @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); changes.add(ch); when(ch.getRootNode()).thenReturn(node); final Node netconfNodeBefore = getNetconfNode("netconfNode1", - NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); + ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED); when(node.getDataBefore()).thenReturn(netconfNodeBefore); @@ -167,7 +166,7 @@ public class NetConfTopologyListenerTest { verify(networkModelService, never()).deleteOpenRoadmnode(anyString()); } - private Node getNetconfNode(final String nodeId, final NetconfNodeConnectionStatus.ConnectionStatus cs, + private Node getNetconfNode(final String nodeId, final ConnectionStatus cs, final String openRoadmVersion) { final List avCapList = new ArrayList<>(); avCapList.add(new AvailableCapabilityBuilder()