Move AbstractDOMDataBroker to mdsal-dom-spi

[mdsal.git] / dom / mdsal-dom-broker / src / test / java / org / opendaylight / mdsal / dom / broker / DOMMountPointServiceImplTest.java

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java
index a4719b30bbbfee59d18abd78db6ee649c3a204c6..37c90472f24b371c2827806837a56a15369c1bb1 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java
@@ -15,6 +15,7 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
@@ -25,7 +26,6 @@ import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 public class DOMMountPointServiceImplTest {
 
@@ -49,9 +49,6 @@ public class DOMMountPointServiceImplTest {
         // Create a mount point with schema context and a DOMService
         final DOMMountPointBuilder mountPointBuilder = mountPointService.createMountPoint(PATH);
 
-        final EffectiveModelContext schemaContext = mock(EffectiveModelContext.class);
-        mountPointBuilder.addInitialSchemaContext(schemaContext);
-
         final DOMRpcService rpcService = mock(DOMRpcService.class);
         mountPointBuilder.addService(DOMRpcService.class, rpcService);
 
@@ -62,11 +59,8 @@ public class DOMMountPointServiceImplTest {
         assertTrue(mountPointService.getMountPoint(PATH).isPresent());
 
         // Verify mount point schema context and service
-        final DOMMountPoint mountPoint = mountPointService.getMountPoint(PATH).get();
-        assertTrue(mountPoint.getService(DOMRpcService.class).isPresent());
-        assertEquals(rpcService, mountPoint.getService(DOMRpcService.class).get());
-
-        assertEquals(schemaContext, mountPoint.getSchemaContext());
+        final DOMMountPoint mountPoint = mountPointService.getMountPoint(PATH).orElseThrow();
+        assertEquals(Optional.of(rpcService), mountPoint.getService(DOMRpcService.class));
     }
 
     @Test
@@ -75,8 +69,7 @@ public class DOMMountPointServiceImplTest {
         doNothing().when(mountPointListener).onMountPointRemoved(PATH);
 
         final ObjectRegistration<DOMMountPoint> mountPointRegistration =
-                mountPointService.createMountPoint(PATH).addInitialSchemaContext(mock(EffectiveModelContext.class))
-                .register();
+                mountPointService.createMountPoint(PATH).register();
 
         mountPointService.registerProvisionListener(mountPointListener);