Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Turn NetworkUtilsImpl into a Component
[transportpce.git]
/
networkmodel
/
src
/
test
/
java
/
org
/
opendaylight
/
transportpce
/
networkmodel
/
NetworkModelProviderTest.java
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 c2ea4b72dfc3cc3c0a3121e45148bbe317703279..c0ff6eccac8859694be50cfa848b1ee6d886b684 100644
(file)
--- a/
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
+++ b/
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
@@
-13,35
+13,48
@@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.google.common.util.concurrent.FluentFuture;
import static org.mockito.Mockito.when;
import com.google.common.util.concurrent.FluentFuture;
-import org.junit.Test;
-import org.junit.
runner.Run
With;
+import org.junit.
jupiter.api.
Test;
+import org.junit.
jupiter.api.extension.Extend
With;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
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.mockito.stubbing.Answer;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.NotificationService;
import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
+import org.opendaylight.transportpce.common.mapping.PortMapping;
import org.opendaylight.transportpce.common.network.NetworkTransactionService;
import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService;
+import org.opendaylight.transportpce.networkmodel.service.FrequenciesService;
+import org.opendaylight.transportpce.networkmodel.service.NetworkModelService;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.TransportpceNetworkutilsService;
-
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class NetworkModelProviderTest extends AbstractTest {
+@ExtendWith(MockitoExtension.class)
+public class NetworkModelProviderTest {
@Mock
NetworkTransactionService networkTransactionService;
@Mock
@Mock
NetworkTransactionService networkTransactionService;
@Mock
+ DataBroker dataBroker;
+ @Mock
RpcProviderService rpcProviderService;
@Mock
RpcProviderService rpcProviderService;
@Mock
- TransportpceNetworkutilsService networkutilsService;
+ NetworkModelService networkModelService;
+ @Mock
+ DeviceTransactionManager deviceTransactionManager;
+ @Mock
+ PortMapping portMapping;
@Mock
NetConfTopologyListener topologyListener;
@Mock
NetConfTopologyListener topologyListener;
-
+ @Mock
+ NotificationService notificationService;
+ @Mock
+ FrequenciesService frequenciesService;
+ @Mock
+ TransportpceNetworkutilsService networkUtils;
@Test
@Test
- public void networkmodelProviderInitTest() {
- NetworkModelProvider provider = new NetworkModelProvider(networkTransactionService, getDataBroker(),
- rpcProviderService, networkutilsService, topologyListener);
+ void networkmodelProviderInitTest() {
Answer<FluentFuture<CommitInfo>> answer = new Answer<FluentFuture<CommitInfo>>() {
@Override
Answer<FluentFuture<CommitInfo>> answer = new Answer<FluentFuture<CommitInfo>>() {
@Override
@@
-52,10
+65,11
@@
public class NetworkModelProviderTest extends AbstractTest {
};
when(networkTransactionService.commit()).then(answer);
};
when(networkTransactionService.commit()).then(answer);
- provider.init();
+ new NetworkModelProvider(networkTransactionService, dataBroker, rpcProviderService, networkModelService,
+ deviceTransactionManager, portMapping, notificationService, frequenciesService, networkUtils);
verify(rpcProviderService, times(1))
.registerRpcImplementation(any(), any(TransportpceNetworkutilsService.class));
verify(rpcProviderService, times(1))
.registerRpcImplementation(any(), any(TransportpceNetworkutilsService.class));
+ verify(dataBroker, times(2)).registerDataTreeChangeListener(any(), any());
}
}
-
}
}