X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2FPceSendingPceRPCsTest.java;h=06a5838db860611449830327f03c45e63cbec55f;hp=8cd611e2844dc6070f29836a52717902a29c65fd;hb=a77937222db28970e716507baa1d221679d4e0d0;hpb=f5a8fe61d265bce36b2fca393d82685a22ac326a 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 8cd611e28..06a5838db 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java @@ -10,35 +10,34 @@ 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.junit.MockitoJUnitRunner; 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.RequestProcessor; 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; - -@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 = dataStoreContext.getDataBroker(); + private DataBroker dataBroker = this.getDataBroker(); @Before public void setUp() throws Exception { // PceTestUtils.writeTopologyIntoDataStore( -// dataBroker, dataStoreContext, "./topologyData/basePceTopology.json"); +// dataBroker, dataStoreContext, "./topologyData/NW-simple-topology.xml"); + PceTestUtils.writeNetworkIntoDataStore(dataBroker, dataStoreContext, TransactionUtils.getNetworkForSpanLoss()); networkTransaction = new NetworkTransactionImpl(new RequestProcessor(dataBroker)); pceSendingPceRPCs = new PceSendingPceRPCs(); pceSendingPceRPCs = - new PceSendingPceRPCs(PceTestData.getPCERequest(), networkTransaction - ); + new PceSendingPceRPCs(PceTestData.getPCE_test1_request_54(), networkTransaction); } @Test @@ -73,5 +72,4 @@ public class PceSendingPceRPCsTest extends AbstractTest { Assert.assertNull(pceSendingPceRPCs.getGnpyZtoA()); } - }