X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Fimpl%2FServiceHandlerImplTest.java;h=685a4fcc6cab135448c4924877b90d7e27625ed0;hb=fcfab00be3ad84e5616eb2df9b922a726c615c57;hp=bb9529952b331557b9d16fe881f12002beca85eb;hpb=6bac4eb91d774b60014294e67aef6c43da20fb10;p=transportpce.git diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java index bb9529952..685a4fcc6 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java @@ -34,6 +34,7 @@ import org.opendaylight.transportpce.pce.service.PathComputationServiceImpl; import org.opendaylight.transportpce.pce.utils.NotificationPublishServiceMock; import org.opendaylight.transportpce.pce.utils.PceTestData; import org.opendaylight.transportpce.pce.utils.PceTestUtils; +import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.servicehandler.ModelMappingUtils; import org.opendaylight.transportpce.servicehandler.ServiceEndpointType; @@ -88,6 +89,7 @@ public class ServiceHandlerImplTest extends AbstractTest { private PathComputationService pathComputationService; private RendererServiceOperations rendererServiceOperations; + private NetworkModelWavelengthService networkModelWavelengthService; private ServicehandlerImpl serviceHandler; @Mock @@ -111,8 +113,8 @@ public class ServiceHandlerImplTest extends AbstractTest { @Before public void setUp() { this.serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, - this.rendererServiceOperations); - this.serviceHandlerImplMock = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); + this.rendererServiceOperations, this.networkModelWavelengthService); + this.serviceHandlerImplMock = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null, null); MockitoAnnotations.initMocks(this); } @@ -121,7 +123,8 @@ public class ServiceHandlerImplTest extends AbstractTest { this.pathComputationService = new PathComputationServiceImpl(getDataBroker(), notificationPublishService); PceTestUtils.writeTopologyIntoDataStore(getDataBroker(), getDataStoreContextUtil(), "topologyData/NW-simple-topology.xml"); - this.rendererServiceOperations = new StubRendererServiceOperations(); + this.rendererServiceOperations = + new StubRendererServiceOperations(this.networkModelWavelengthService, getDataBroker()); } @Test @@ -341,7 +344,8 @@ public class ServiceHandlerImplTest extends AbstractTest { @Test public void createServiceHandlerNotValidServiceAEndRateIsNull() throws ExecutionException, InterruptedException { - ServicehandlerImpl servicehandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); + ServicehandlerImpl servicehandler = + new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null, null); ServiceCreateInput notValidServiceAEnd = ServiceDataUtils.buildServiceCreateInput(); ServiceCreateInputBuilder buildInput = new ServiceCreateInputBuilder(notValidServiceAEnd); notValidServiceAEnd = buildInput.setServiceAEnd(ServiceDataUtils.getServiceAEndBuild().setServiceRate(null) @@ -354,7 +358,8 @@ public class ServiceHandlerImplTest extends AbstractTest { @Test public void createServiceHandlerNotValidServiceZEndRateIsNull() throws ExecutionException, InterruptedException { - ServicehandlerImpl servicehandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); + ServicehandlerImpl servicehandler = + new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null, null); ServiceCreateInput notValidServiceZEnd = ServiceDataUtils.buildServiceCreateInput(); ServiceCreateInputBuilder buildInput = new ServiceCreateInputBuilder(notValidServiceZEnd); notValidServiceZEnd = buildInput.setServiceZEnd(ServiceDataUtils.getServiceZEndBuild().setServiceRate(null) @@ -518,7 +523,7 @@ public class ServiceHandlerImplTest extends AbstractTest { txDirectionBuilder.setLgx(lgx); serviceAEndBuilder.setTxDirection(txDirectionBuilder.build()); ServiceCreateInputBuilder buildInput = new ServiceCreateInputBuilder(serviceCreateInput); - this.serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); + this.serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null, null); return serviceHandler.serviceCreate(buildInput.setServiceAEnd(serviceAEndBuilder.build()).build()).get() .getResult(); } @@ -801,7 +806,7 @@ public class ServiceHandlerImplTest extends AbstractTest { rxDirectionBuilder.setLgx(lgx); serviceAEndBuilder.setRxDirection(rxDirectionBuilder.build()); ServiceCreateInputBuilder buildInput = new ServiceCreateInputBuilder(serviceCreateInput); - this.serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); + this.serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null, null); return serviceHandler.serviceCreate(buildInput.setServiceAEnd(serviceAEndBuilder.build()).build()).get() .getResult(); }