X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fservice%2FPathComputationServiceImplTest.java;h=62de9fb3fe171542a1833021a9ba114934e93a83;hp=b7ccf9183314c6424413b45928483ba772d4d9dd;hb=a77937222db28970e716507baa1d221679d4e0d0;hpb=f5a8fe61d265bce36b2fca393d82685a22ac326a

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java
index b7ccf9183..62de9fb3f 100644
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java
@@ -11,21 +11,35 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.transportpce.common.DataStoreContext;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
+import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.pce.gnpy.GnpyResult;
 import org.opendaylight.transportpce.pce.gnpy.GnpyTopoImpl;
 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 PathComputationServiceImplTest extends AbstractTest {
 
     private PathComputationServiceImpl pathComputationServiceImpl;
+    private static NetworkTransactionService networkTransactionService = null;
+    private static GnpyTopoImpl gnpyTopoImpl = null;
+    private static GnpyResult gnpyResult = null;
+    private DataStoreContext dataStoreContext = this.getDataStoreContextUtil();
+    private DataBroker dataBroker = this.getDataBroker();
 
     @Before
     public void setUp() {
+        networkTransactionService = Mockito.mock(NetworkTransactionService.class);
+        gnpyTopoImpl = Mockito.mock(GnpyTopoImpl.class);
+        gnpyResult = Mockito.mock(GnpyResult.class);
         pathComputationServiceImpl = new PathComputationServiceImpl(
-                new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())),
+                networkTransactionService,
                 this.getNotificationPublishService());
         pathComputationServiceImpl.init();
     }
@@ -33,18 +47,18 @@ public class PathComputationServiceImplTest extends AbstractTest {
     @Test
     public void pathComputationRequestTest() {
         Assert.assertNotNull(
-                pathComputationServiceImpl.pathComputationRequest(PceTestData.getEmptyPCERequest()));
+                pathComputationServiceImpl.pathComputationRequest(PceTestData.getPCE_simpletopology_test1_request()));
 
     }
 
     @Test(expected = Exception.class)
     public void generateGnpyResponse() throws Exception {
-
-        GnpyResult gnpyResult =
+        PceTestUtils.writeNetworkIntoDataStore(dataBroker, dataStoreContext, TransactionUtils.getNetworkForSpanLoss());
+        GnpyResult gnpyResult2 =
                 new GnpyResult("A-to-Z",
                         new GnpyTopoImpl(new NetworkTransactionImpl(
-                                new RequestProcessor(this.getNewDataBroker()))));
-        pathComputationServiceImpl.generateGnpyResponse(gnpyResult.getResponse(), "A-to-Z");
+                                new RequestProcessor(dataBroker))));
+        pathComputationServiceImpl.generateGnpyResponse(gnpyResult2.getResponse(), "A-to-Z");
     }