X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2FPcePathDescriptionTests.java;h=4399afda1da3930a672d3f1415044424c2498b9f;hb=HEAD;hp=95a2d0d262f303c6f3cd34a5c7b47fa9e5de247b;hpb=f49968974e1477d4fd9cfdd87d867c9ad347678e;p=transportpce.git

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
index 95a2d0d26..4399afda1 100644
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
@@ -8,18 +8,19 @@
 
 package org.opendaylight.transportpce.pce;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+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;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.common.mapping.PortMapping;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
-import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.transportpce.pce.constraints.PceConstraintsCalc;
 import org.opendaylight.transportpce.pce.networkanalyzer.MapUtils;
@@ -29,7 +30,7 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceResult;
 import org.opendaylight.transportpce.pce.utils.NodeUtils;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeBuilder;
@@ -48,13 +49,13 @@ public class PcePathDescriptionTests extends AbstractTest {
     @Mock
     private PortMapping portMapping;
 
-    @Before
+    @BeforeEach
     public 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 = NodeUtils
+            .createRoadmToRoadm("OpenROADM-3-2-DEG1", "OpenROADM-3-1-DEG1", "DEG1-TTP-TX", "DEG1-TTP-RX")
+            .build();
 
         //  Link link=genereateLinkBuilder();
 
@@ -70,35 +71,33 @@ public class PcePathDescriptionTests extends AbstractTest {
                 GridConstant.SLOT_WIDTH_50);
 
         pceLink = new PceLink(link, pceOpticalNode, pceOpticalNode2);
-        pceLink.setClient("XPONDER-CLIENT");
+        pceLink.setClientA("XPONDER-CLIENT");
 
         pceResult = new PceResult();
         pceResult.setRC("200");
         pceResult.setRate(Long.valueOf(1));
         pceResult.setServiceType(StringConstants.SERVICE_TYPE_100GE_T);
-        Map<LinkId, PceLink> map = Map.of(new LinkId("OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1"), pceLink);
-        pcePathDescription = new PcePathDescription(List.of(pceLink),
-                map, pceResult);
+        pceResult.setMaxFreq(new BigDecimal("195.900"));
+        pceResult.setMinFreq(new BigDecimal("191.101"));
+        Map<LinkId, PceLink> map = Map.of(
+            new LinkId("OpenROADM-3-2-DEG1-DEG1-TTP-TXtoOpenROADM-3-1-DEG1-DEG1-TTP-RX"), pceLink,
+            new LinkId("OpenROADM-3-1-DEG1-DEG1-TTP-RXtoOpenROADM-3-2-DEG1-DEG1-TTP-TX"), pceLink);
+        pcePathDescription = new PcePathDescription(List.of(pceLink), map, pceResult);
     }
 
-    // TODO fix opposite link
-    @Test(expected = Exception.class)
-    public void buildDescriptionsTest() {
-
+    @Test
+    void buildDescriptionsTest() {
         pcePathDescription.buildDescriptions();
-        Assert.assertEquals(pcePathDescription.getReturnStructure().getMessage(), "No path available by PCE");
+        assertEquals(pcePathDescription.getReturnStructure().getMessage(), "Path is calculated by PCE");
     }
 
     @Test
-    public void mapUtil() {
+    void mapUtil() {
         PceConstraints pceConstraintsCalc = new PceConstraintsCalc(
-                    PceTestData.getPCERequest(),
-                    new NetworkTransactionImpl(new RequestProcessor(getDataBroker())))
-                .getPceHardConstraints();
+            PceTestData.getPCERequest(), new NetworkTransactionImpl(getDataBroker())).getPceHardConstraints();
         MapUtils.mapDiversityConstraints(List.of(node), List.of(link), pceConstraintsCalc);
         MapUtils.getSupLink(link);
         MapUtils.getAllSupNode(node);
         MapUtils.getSRLGfromLink(link);
     }
-
 }