X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FNetworkModelProviderTest.java;h=5f31c3bdcf4487ca2795379297602019e24b7805;hb=6bc844fe96e1bd2ae991f5a1b2ad3f7446f87f10;hp=ba0b84ffb70f0442eb375a260fe6a222d565a839;hpb=39b006abcabecfe5177181eed53ede1abb760f28;p=transportpce.git diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java index ba0b84ffb..5f31c3bdc 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java @@ -13,21 +13,22 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.util.concurrent.FluentFuture; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; import org.opendaylight.mdsal.binding.api.NotificationService; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthService; +import org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener; +import org.opendaylight.transportpce.networkmodel.service.FrequenciesService; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.TransportpceNetworkutilsService; -@RunWith(MockitoJUnitRunner.StrictStubs.class) +@ExtendWith(MockitoExtension.class) public class NetworkModelProviderTest extends AbstractTest { @Mock NetworkTransactionService networkTransactionService; @@ -40,14 +41,16 @@ public class NetworkModelProviderTest extends AbstractTest { @Mock private NotificationService notificationService; @Mock - private NetworkModelWavelengthService networkModelWavelengthService; + private FrequenciesService frequenciesService; + @Mock + private PortMappingListener portMappingListener; @Test - public void networkmodelProviderInitTest() { + void networkmodelProviderInitTest() { NetworkModelProvider provider = new NetworkModelProvider(networkTransactionService, getDataBroker(), rpcProviderService, networkutilsService, topologyListener, notificationService, - networkModelWavelengthService); + frequenciesService, portMappingListener); Answer> answer = new Answer>() { @Override @@ -63,5 +66,4 @@ public class NetworkModelProviderTest extends AbstractTest { verify(rpcProviderService, times(1)) .registerRpcImplementation(any(), any(TransportpceNetworkutilsService.class)); } - }