X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dom%2Fmdsal-dom-inmemory-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FWildcardedScopeSubtreeTest.java;fp=opendaylight%2Fmd-sal%2Fsal-inmemory-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FWildcardedScopeSubtreeTest.java;h=6055d778724288009fb932a49b7e52e6606e2de6;hb=c9e43c3fa7ecc66546afb7eda8a1b5d5b15f4120;hp=a7fa24f2934a8da5dc879236147f6fd35df14cba;hpb=ecf38b90583e84c6362aaf32c24fd356f25d5e46;p=mdsal.git diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java similarity index 80% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java index a7fa24f293..6055d77872 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java @@ -12,17 +12,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.concurrent.ExecutionException; - import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSuite { - private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node( - TopLevelList.QNAME); + private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TestModel.OUTER_LIST_QNAME).node( + TestModel.OUTER_LIST_QNAME); @Override protected void customizeTask(final DatastoreTestTask task) { @@ -32,7 +30,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotContains(change.getCreatedData(), TOP_LEVEL); assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR)); @@ -45,7 +43,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertContains(change.getCreatedData(), path(FOO, BAZ)); @@ -59,7 +57,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertFalse(change.getCreatedData().isEmpty()); @@ -74,7 +72,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertTrue(change.getCreatedData().isEmpty()); assertContains(change.getUpdatedData(), path(FOO)); @@ -86,7 +84,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertEmpty(change.getCreatedData()); assertEmpty(change.getUpdatedData()); @@ -97,7 +95,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO,BAZ)); assertNotContains(change.getCreatedData(), path(FOO,BAR)); @@ -108,7 +106,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO,BAR),path(FOO,BAZ)); assertContains(change.getUpdatedData(), path(FOO)); @@ -118,7 +116,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO_SIBLING)); assertNotContains(change.getUpdatedData(), path(FOO), TOP_LEVEL);