Migrate pce module to JUnit5

[transportpce.git] / pce / src / test / java / org / opendaylight / transportpce / pce / graph / PceGraphEdgeTest.java

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java
index 1eee3899c08dee5d875c4b931e1409dd2eed41cc..64701868904b7da3c508127f0bd052aebf8066c7 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java
@@ -8,9 +8,10 @@
 
 package org.opendaylight.transportpce.pce.graph;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.transportpce.common.StringConstants;
@@ -35,24 +36,19 @@ public class PceGraphEdgeTest {
     private PortMapping portMapping;
 
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         MockitoAnnotations.openMocks(this);
         // Build Link
-        link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1",
-                "OpenROADM-3-1-DEG1",
-                "DEG1-TTP-TX", "DEG1-TTP-RX").build();
-
-        //  Link link=genereateLinkBuilder();
+        link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1", "OpenROADM-3-1-DEG1", "DEG1-TTP-TX", "DEG1-TTP-RX")
+                .build();
         node =  NodeUtils.getNodeBuilder(NodeUtils.geSupportingNodes()).build();
-
         PceOpticalNode pceOpticalNode = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node,
                 OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1,
                 GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50);
         PceOpticalNode pceOpticalNode2 = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node,
                 OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1,
                 GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50);
-
         pceLink = new PceLink(link, pceOpticalNode, pceOpticalNode2);
         pceLink.setClient("XPONDER-CLIENT");
 
@@ -60,8 +56,7 @@ public class PceGraphEdgeTest {
     }
 
     @Test
-    public void getLink() {
-        Assert.assertEquals(pceGraphEdge.link().getLinkId(),
-                pceLink.getLinkId());
+    void getLink() {
+        assertEquals(pceGraphEdge.link().getLinkId(), pceLink.getLinkId());
     }
 }