X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fdom%2Fbroker%2FBackwardsCompatibleMountPointTest.java;h=91ae0c24ddf9e664c596dc506bff371e5e90d2ef;hb=e32962f3d6592e84a50e7cd3a83c78613ed76a0c;hp=5a36f710ff6ff2219d7660af68620bebca1bd5ac;hpb=04edc933c45e9860734bc214a433b597a884bb59;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/sal/dom/broker/BackwardsCompatibleMountPointTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/sal/dom/broker/BackwardsCompatibleMountPointTest.java index 5a36f710ff..91ae0c24dd 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/sal/dom/broker/BackwardsCompatibleMountPointTest.java +++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/sal/dom/broker/BackwardsCompatibleMountPointTest.java @@ -33,7 +33,7 @@ import org.opendaylight.controller.sal.core.api.data.DataProviderService; import org.opendaylight.controller.sal.dom.broker.impl.SchemaContextProvider; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; public class BackwardsCompatibleMountPointTest { private static final Logger log = LoggerFactory.getLogger(BackwardsCompatibleMountPointManagerTest.class); - private static final InstanceIdentifier id = BackwardsCompatibleMountPointManagerTest.id; + private static final YangInstanceIdentifier id = BackwardsCompatibleMountPointManagerTest.id; private final NormalizedNode normalizedNode = mockNormalizedNode(); private final CompositeNode compositeNode = mockCompositeNode(); @@ -139,10 +139,10 @@ public class BackwardsCompatibleMountPointTest { private DataNormalizer mockNormalizer() throws DataNormalizationException { final DataNormalizer mock = mock(DataNormalizer.class); - doReturn(new AbstractMap.SimpleEntry>(id, normalizedNode) {}) - .when(mock).toNormalized(any(InstanceIdentifier.class), any(CompositeNode.class)); - doReturn(compositeNode).when(mock).toLegacy(any(InstanceIdentifier.class), any(NormalizedNode.class)); - doReturn(id).when(mock).toLegacy(any(InstanceIdentifier.class)); + doReturn(new AbstractMap.SimpleEntry>(id, normalizedNode) {}) + .when(mock).toNormalized(any(YangInstanceIdentifier.class), any(CompositeNode.class)); + doReturn(compositeNode).when(mock).toLegacy(any(YangInstanceIdentifier.class), any(NormalizedNode.class)); + doReturn(id).when(mock).toLegacy(any(YangInstanceIdentifier.class)); return mock; } @@ -151,4 +151,4 @@ public class BackwardsCompatibleMountPointTest { doReturn("mockNormalizedNode").when(mock).toString(); return mock; } -} \ No newline at end of file +}