improve pce unit tests

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

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
index 6bf59376a6dbd9b661dc64372771e58b6fd283fa..4e5f69bdaacaf686359b82b0e4bdb10b5ab6a7cf 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.transportpce.pce;
 
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -18,7 +19,6 @@ import org.opendaylight.transportpce.pce.gnpy.ConnectToGnpyServer;
 import org.opendaylight.transportpce.pce.gnpy.JerseyServer;
 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;
 
 
@@ -29,16 +29,13 @@ public class PceSendingPceRPCsTest extends AbstractTest {
     private NetworkTransactionImpl networkTransaction;
     private DataStoreContext dataStoreContext = this.getDataStoreContextUtil();
     private DataBroker dataBroker = this.getDataBroker();
-    private JerseyServer  jerseyServer = new JerseyServer();
+    private JerseyServer jerseyServer = new JerseyServer();
 
 
     @Before
-    public void setUp() throws Exception {
-//        PceTestUtils.writeTopologyIntoDataStore(
-//                dataBroker, dataStoreContext, "./topologyData/NW-simple-topology.xml");
-        PceTestUtils.writeNetworkIntoDataStore(dataBroker, dataStoreContext, TransactionUtils.getNetworkForSpanLoss());
-        networkTransaction = new NetworkTransactionImpl(new RequestProcessor(dataBroker));
-        pceSendingPceRPCs = new PceSendingPceRPCs();
+    public void setUp() {
+        networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker()));
+        PceTestUtils.writeNetworkInDataStore(this.getDataBroker());
         pceSendingPceRPCs =
                 new PceSendingPceRPCs(PceTestData.getPCE_test1_request_54(), networkTransaction);
     }
@@ -46,14 +43,16 @@ public class PceSendingPceRPCsTest extends AbstractTest {
     @Test
     public void cancelResourceReserve() {
         pceSendingPceRPCs.cancelResourceReserve();
-        Assert.assertEquals(true, pceSendingPceRPCs.getSuccess());
+        Assert.assertTrue("Success should equal to true", pceSendingPceRPCs.getSuccess());
     }
 
     @Test
     public void pathComputationTest() throws Exception {
         jerseyServer.setUp();
         pceSendingPceRPCs =
-                new PceSendingPceRPCs(PceTestData.getGnpyPCERequest("nodeA","nodeZ"), networkTransaction);
+                new PceSendingPceRPCs(PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"),
+                        networkTransaction);
+
         pceSendingPceRPCs.pathComputation();
         ConnectToGnpyServer connectToGnpy = new ConnectToGnpyServer();
         Assert.assertTrue(connectToGnpy.isGnpyURLExist());
@@ -81,4 +80,5 @@ public class PceSendingPceRPCsTest extends AbstractTest {
         Assert.assertNull(pceSendingPceRPCs.getGnpyZtoA());
     }
 
+
 }