X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceCalculationTest.java;h=74cfbab5bda11f4e483456d76d476ef1ac65f14b;hb=43a4ee16c3edd94339947da89a1a7c7c730a0185;hp=39f0e709671790fc1396bba2e4e23305a76e433e;hpb=93e2068ee8a54727284d2f19004c6a4a23899275;p=transportpce.git

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java
index 39f0e7096..74cfbab5b 100644
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.transportpce.pce.networkanalyzer;
 
+import java.util.concurrent.ExecutionException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,33 +15,55 @@ import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.pce.constraints.PceConstraintsCalc;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
+import org.opendaylight.transportpce.pce.utils.PceTestUtils;
+import org.opendaylight.transportpce.pce.utils.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 
+
 public class PceCalculationTest extends AbstractTest {
 
     private PceCalculation pceCalculation;
+    private PceConstraintsCalc pceConstraintsCalc;
+    private PceResult pceResult = new PceResult();
 
     // setup object
     @Before
-    public void setUp() {
-        PceResult pceResult = new PceResult();
+    public void setUp() throws ExecutionException, InterruptedException {
         pceResult.setRC("200");
+        PceTestUtils.writeNetworkIntoDataStore(this.getDataBroker(), this.getDataStoreContextUtil(),
+                TransactionUtils.getNetworkForSpanLoss());
+        pceConstraintsCalc = new PceConstraintsCalc(PceTestData.getPCERequest(),
+                new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())));
 
-        PceConstraintsCalc pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCERequest(), new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())));
         pceCalculation = new PceCalculation(
                 PceTestData.getPCERequest(),
                 new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())),
                 pceConstraintsCalc.getPceHardConstraints(),
                 pceConstraintsCalc.getPceSoftConstraints(),
                 pceResult);
+    }
 
+    @Test
+    public void testPceCalculationValues() {
 
+        pceCalculation.retrievePceNetwork();
+        Assert.assertEquals("100GE", pceCalculation.getServiceType());
+        Assert.assertNotNull(pceCalculation.getReturnStructure());
+
+        Assert.assertNull(pceCalculation.getaendPceNode());
+        Assert.assertNull(pceCalculation.getzendPceNode());
     }
 
+
     @Test
-    public void testPceCalculationValues() {
+    public void testPceCalculationValues2() {
 
+        pceCalculation = new PceCalculation(
+                PceTestData.getPathComputationRequestInputWithCoRoutingOrGeneral(),
+                new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())),
+                pceConstraintsCalc.getPceHardConstraints(),
+                pceConstraintsCalc.getPceSoftConstraints(),
+                pceResult);
         pceCalculation.retrievePceNetwork();
         Assert.assertEquals("100GE", pceCalculation.getServiceType());
         Assert.assertNotNull(pceCalculation.getReturnStructure());