Eliminate SchemaResourcesDTO

[netconf.git] / apps / netconf-topology-singleton / src / test / java / org / opendaylight / netconf / topology / singleton / impl / NetconfNodeManagerTest.java

diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java
index 168bd613503f357ae6de9843fc1cb96850c61cde..69d02be4786b02196c4008859a69f97ca7bce39c 100644 (file)
--- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java
+++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java
@@ -56,7 +56,7 @@ import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
-import org.opendaylight.netconf.client.mdsal.NetconfDevice;
+import org.opendaylight.netconf.client.mdsal.api.DeviceNetconfSchemaProvider;
 import org.opendaylight.netconf.client.mdsal.api.NetconfDeviceSchemasResolver;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceServices;
@@ -162,9 +162,8 @@ public class NetconfNodeManagerTest extends AbstractBaseSchemasTest {
         NetconfTopologySetup masterSetup = NetconfTopologySetup.builder()
                 .setActorSystem(masterSystem)
                 .setDataBroker(mockDataBroker)
-                .setSchemaResourceDTO(new NetconfDevice.SchemaResourcesDTO(
-                    masterSchemaRepository, masterSchemaRepository, mockSchemaContextFactory, mockSchemasResolver))
                 .setBaseSchemaProvider(BASE_SCHEMAS)
+                .setDeviceSchemaProvider(createDeviceSchemaProvider(masterSchemaRepository))
                 .build();
 
         testMasterActorRef = TestActorRef.create(masterSystem, Props.create(TestMasterActor.class, masterSetup,
@@ -178,9 +177,8 @@ public class NetconfNodeManagerTest extends AbstractBaseSchemasTest {
         NetconfTopologySetup slaveSetup = NetconfTopologySetup.builder()
                 .setActorSystem(slaveSystem)
                 .setDataBroker(mockDataBroker)
-                .setSchemaResourceDTO(new NetconfDevice.SchemaResourcesDTO(
-                    slaveSchemaRepository, slaveSchemaRepository, mockSchemaContextFactory, mockSchemasResolver))
                 .setBaseSchemaProvider(BASE_SCHEMAS)
+                .setDeviceSchemaProvider(createDeviceSchemaProvider(slaveSchemaRepository))
                 .build();
 
         netconfNodeManager = new NetconfNodeManager(slaveSetup, DEVICE_ID, responseTimeout,
@@ -189,6 +187,13 @@ public class NetconfNodeManagerTest extends AbstractBaseSchemasTest {
         setupMountPointMocks();
     }
 
+    private static DeviceNetconfSchemaProvider createDeviceSchemaProvider(final SharedSchemaRepository repository) {
+        final var provider = mock(DeviceNetconfSchemaProvider.class);
+        doReturn(repository).when(provider).registry();
+        doReturn(repository).when(provider).repository();
+        return provider;
+    }
+
     @After
     public void teardown() {
         TestKit.shutdownActorSystem(slaveSystem, true);