X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FOpenRoadmNetworkTest.java;h=20a20e89d37ac43587601fb77fb3b7bb9de2c4da;hb=6bc844fe96e1bd2ae991f5a1b2ad3f7446f87f10;hp=ec3a3c34e301e20e574d76fb74fe2f3ef4f24d7d;hpb=a74ea5d87a2fe898b47a8f268e03522a6caaf3db;p=transportpce.git

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetworkTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetworkTest.java
index ec3a3c34e..20a20e89d 100644
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetworkTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetworkTest.java
@@ -8,19 +8,21 @@
 package org.opendaylight.transportpce.networkmodel.util;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.OpenroadmNodeVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
 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.network.rev180226.NetworkId;
@@ -32,7 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev
 public class OpenRoadmNetworkTest {
 
     @Test
-    public void createXpdrNodeTest() {
+    void createXpdrNodeTest() {
         NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Xpdr, "nodeA");
         Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
         assertEquals("XPDRA01", createdNode.getNodeId().getValue());
@@ -42,7 +44,7 @@ public class OpenRoadmNetworkTest {
     }
 
     @Test
-    public void createRdmNodeTest() {
+    void createRdmNodeTest() {
         NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Rdm, "nodeA");
         Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
         assertEquals("XPDRA01", createdNode.getNodeId().getValue());
@@ -52,23 +54,22 @@ public class OpenRoadmNetworkTest {
     }
 
     @Test
-    public void createNodeWithBadNodeTypeTest() {
+    void createNodeWithBadNodeTypeTest() {
         NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Ila, "nodeA");
         Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
         assertEquals("XPDRA01", createdNode.getNodeId().getValue());
-        assertNull("NodeType should be ROADM or XPONDER", createdNode.augmentation(Node1.class).getNodeType());
+        assertNull(createdNode.augmentation(Node1.class).getNodeType(), "NodeType should be ROADM or XPONDER");
 
         supportingNodeTest(nodeInfo.getNodeClli(), createdNode);
     }
 
-    @Ignore
     @Test
-    public void createNodeWithoutClliTest() {
+    void createNodeWithoutClliTest() {
         NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Xpdr, null);
-        Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
-        assertEquals("XPDRA01", createdNode.getNodeId().getValue());
-        assertEquals("XPONDER", createdNode.augmentation(Node1.class).getNodeType().getName());
-        assertEquals(0, createdNode.getSupportingNode().size());
+        Exception exception = assertThrows(NullPointerException.class, () -> {
+            OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
+        });
+        assertTrue("Supplied value may not be null".contains(exception.getMessage()));
     }
 
     private NodeInfo computeNodeInfo(NodeTypes nodeType, String clli) {
@@ -78,7 +79,7 @@ public class OpenRoadmNetworkTest {
             .setNodeType(nodeType)
             .setNodeClli(clli)
             .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmVersion._121)
+            .setOpenroadmVersion(OpenroadmNodeVersion._121)
             .build();
     }