GNPy client refactor

[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 4e5f69bdaacaf686359b82b0e4bdb10b5ab6a7cf..299d9379ea61ffb2ef559f32cf0c2884cb1bb5a7 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
@@ -11,33 +11,44 @@ package org.opendaylight.transportpce.pce;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.transportpce.common.DataStoreContext;
+import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
-import org.opendaylight.transportpce.pce.gnpy.ConnectToGnpyServer;
 import org.opendaylight.transportpce.pce.gnpy.JerseyServer;
+import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumer;
+import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumerImpl;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.pce.utils.PceTestUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
 
-
-//@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class PceSendingPceRPCsTest extends AbstractTest {
 
     private PceSendingPceRPCs pceSendingPceRPCs;
     private NetworkTransactionImpl networkTransaction;
-    private DataStoreContext dataStoreContext = this.getDataStoreContextUtil();
-    private DataBroker dataBroker = this.getDataBroker();
+    @Mock
+    private YangParserFactory yangParserFactory;
+    @Mock
+    private BindingDOMCodecServices bindingDOMCodecServices;
     private JerseyServer jerseyServer = new JerseyServer();
+    private DataBroker dataBroker;
+    private GnpyConsumer gnpyConsumer;
 
 
     @Before
     public void setUp() {
-        networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker()));
-        PceTestUtils.writeNetworkInDataStore(this.getDataBroker());
-        pceSendingPceRPCs =
-                new PceSendingPceRPCs(PceTestData.getPCE_test1_request_54(), networkTransaction);
+        this.dataBroker = getNewDataBroker();
+        networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.dataBroker));
+        PceTestUtils.writeNetworkInDataStore(this.dataBroker);
+        gnpyConsumer = new GnpyConsumerImpl("http://localhost:9998",
+                "mylogin", "mypassword", getDataStoreContextUtil().getBindingDOMCodecServices());
+        pceSendingPceRPCs = new PceSendingPceRPCs(PceTestData.getPCE_test1_request_54(),
+                        networkTransaction, gnpyConsumer);
     }
 
     @Test
@@ -51,11 +62,10 @@ public class PceSendingPceRPCsTest extends AbstractTest {
         jerseyServer.setUp();
         pceSendingPceRPCs =
                 new PceSendingPceRPCs(PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"),
-                        networkTransaction);
+                        networkTransaction, gnpyConsumer);
 
         pceSendingPceRPCs.pathComputation();
-        ConnectToGnpyServer connectToGnpy = new ConnectToGnpyServer();
-        Assert.assertTrue(connectToGnpy.isGnpyURLExist());
+        Assert.assertTrue(gnpyConsumer.isAvailable());
         jerseyServer.tearDown();
 
     }