Remove transportpce-routing-constraint model

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

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java
index e7fc751178fd6c08150cd23891ff1033060e8910..543996d77f2773a440947e4aed47efe018f2c6ea 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java
@@ -20,61 +20,58 @@ import org.opendaylight.transportpce.pce.utils.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 
 public class PceConstraintsCalcTest extends AbstractTest {
-    private static PceConstraintsCalc pceConstraintsCalc;
     private static NetworkTransactionService networkTransactionService = null;
-    private DataBroker dataBroker = this.getDataBroker();
+    private DataBroker dataBroker = getDataBroker();
 
+    //TODO: review this test class. May be miss few assert.
     @Before
     public void setup() throws Exception {
         // networkTransactionService = Mockito.mock(NetworkTransactionService.class);
-        PceTestUtils.writeNetworkIntoDataStore(dataBroker, this.getDataStoreContextUtil(),
+        PceTestUtils.writeNetworkIntoDataStore(dataBroker, getDataStoreContextUtil(),
                 TransactionUtils.getNetworkForSpanLoss());
         networkTransactionService = new NetworkTransactionImpl(new RequestProcessor(dataBroker));
-
-
     }
 
     @Test
     public void testNoHardOrSoftConstrainsExists() {
         PceTestData.getPCE_test2_request_54().getSoftConstraints();
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getEmptyPCERequest(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getEmptyPCERequest(), networkTransactionService);
     }
 
     @Test()
     public void testHardConstrainsExists() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCE_simpletopology_test1_requestSetHardAndSoftConstrains(), networkTransactionService);
+        new PceConstraintsCalc(
+            PceTestData.getPCE_simpletopology_test1_requestSetHardAndSoftConstrains(),
+            networkTransactionService);
     }
 
     @Test()
     public void testHardConstrainsExists1() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPathComputationRequestInputWithCoRoutingOrGeneral(), networkTransactionService);
+        new PceConstraintsCalc(
+            PceTestData.getPathComputationRequestInputWithCoRoutingOrGeneral(),
+            networkTransactionService);
     }
 
     @Test
     public void testSoftConstrainsExists() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCERequest(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getPCERequest(), networkTransactionService);
     }
 
     @Test(expected = Exception.class)
     public void testHardConstrainsExists2() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .build_diversity_from_request(PceTestData.getPCERequest()), networkTransactionService);
+        new PceConstraintsCalc(
+            PceTestData.build_diversity_from_request(PceTestData.getPCERequest()),
+            networkTransactionService);
     }
 
     @Test()
     public void testHardConstrainsExists3() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getEmptyPCERequestServiceNameWithRequestId(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getEmptyPCERequestServiceNameWithRequestId(), networkTransactionService);
     }
 
-    @Test(expected = Exception.class)
+    @Test()
     public void testHardConstrainsExists4() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCE_test2_request_54(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getPCE_test2_request_54(), networkTransactionService);
     }
 
 }