X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FClliNetworkTest.java;h=8d6fc3d7c6d16dbeffc12ea57ff36d55bb586a99;hb=6bc844fe96e1bd2ae991f5a1b2ad3f7446f87f10;hp=d9983f4ea88bfe910f3d1095c3a941b1da5f2829;hpb=28f2a7aea63e35dd31dd883aa796d11838959324;p=transportpce.git

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
index d9983f4ea..8d6fc3d7c 100644
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.transportpce.networkmodel.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfoBuilder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+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.clli.network.rev191129.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.Node1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
@@ -26,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev
 public class ClliNetworkTest {
 
     @Test
-    public void createNodeTest() {
+    void createNodeTest() {
         //prepare data test
         NodeInfo nodeInfo = computeNodeInfoBuilder().build();
         Node1 clliAugmentation = new Node1Builder()
@@ -35,38 +36,27 @@ public class ClliNetworkTest {
 
         //run test
         Node createdNode = ClliNetwork.createNode("XPDRA01", nodeInfo);
-        assertNull("SupportingNode should be null", createdNode.getSupportingNode());
-        assertEquals("Node key should be equals to NodeClliId ", new NodeKey(new NodeId("NodeClliId")),
-            createdNode.key());
-        assertEquals("Expect org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.Node1 augmentation",
-            clliAugmentation, createdNode.augmentation(Node1.class));
+        assertNull(createdNode.getSupportingNode(), "SupportingNode should be null");
+        assertEquals(new NodeKey(new NodeId("NodeClliId")), createdNode.key(),
+            "Node key should be equals to NodeClliId");
+        assertEquals(clliAugmentation, createdNode.augmentation(Node1.class),
+            "Expect org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.Node1 augmentation");
     }
 
     @Test
-    public void createNodeWithNullDeviceIdTest() {
+    void createNodeWithNullDeviceIdTest() {
         Node createdNode = ClliNetwork.createNode(null, computeNodeInfoBuilder().build());
-        assertNull("SupportingNode should be null", createdNode.getSupportingNode());
-        assertEquals("Node id should be equals to NodeClliId ", new NodeId("NodeClliId"), createdNode.getNodeId());
+        assertNull(createdNode.getSupportingNode(), "SupportingNode should be null");
+        assertEquals(new NodeId("NodeClliId"), createdNode.getNodeId(), "Node id should be equals to NodeClliId");
     }
 
     private NodeInfoBuilder computeNodeInfoBuilder() {
-        NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
+        return new NodeInfoBuilder()
             .setNodeClli("NodeClliId")
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
             .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmVersion._121);
-        return nodeBldr;
-    }
-
-    private NodeInfoBuilder computeNodeInfoBuilderWithoutClli() {
-        NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
-            .setNodeModel("NodeModel")
-            .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
-            .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmVersion._121);
-        return nodeBldr;
+            .setOpenroadmVersion(OpenroadmNodeVersion._121);
     }
 }