X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-inmemory-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FRootScopeSubtreeTest.java;h=c5af4067fccfa7480b55a2c938ea8977eb0a0fb6;hp=ef2a4743e22326d81a6384e71ae49f212770d83c;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hpb=56978581354ce79ffadaa4544302e71c5169f37c

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java
index ef2a4743e2..c5af4067fc 100644
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java
@@ -7,100 +7,90 @@
  */
 package org.opendaylight.controller.md.sal.dom.store.impl;
 
-import java.util.concurrent.ExecutionException;
+import static org.opendaylight.controller.md.sal.dom.store.impl.DatastoreTestTask.added;
+import static org.opendaylight.controller.md.sal.dom.store.impl.DatastoreTestTask.deleted;
+import static org.opendaylight.controller.md.sal.dom.store.impl.DatastoreTestTask.replaced;
+import static org.opendaylight.controller.md.sal.dom.store.impl.DatastoreTestTask.subtreeModified;
 
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-
-public class RootScopeSubtreeTest extends DefaultDataChangeListenerTestSuite {
+public class RootScopeSubtreeTest extends DefaultDataTreeChangeListenerTestSuite {
 
     @Override
-    protected void customizeTask(final DatastoreTestTask task) {
-        task.changeListener(TOP_LEVEL, DataChangeScope.SUBTREE);
+    protected void putTopLevelOneNestedSetup(final DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL));
     }
 
     @Override
-    public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException {
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
-
-        assertContains(change.getCreatedData(), TOP_LEVEL, path(FOO), path(FOO, BAR));
-        assertEmpty(change.getUpdatedData());
-        assertEmpty(change.getRemovedPaths());
+    protected void putTopLevelOneNestedVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
     }
 
     @Override
-    public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException,
-            ExecutionException {
-
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
-
-        assertContains(change.getCreatedData(), path(FOO, BAZ));
-        assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO));
-        assertContains(change.getRemovedPaths(), path(FOO, BAR));
+    protected void replaceTopLevelNestedSetup(DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL), replaced(TOP_LEVEL));
     }
 
     @Override
-    protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException,
-            ExecutionException {
-
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
-
-        assertContains(change.getCreatedData(), TOP_LEVEL, path(FOO), path(FOO, BAR), path(FOO, BAZ));
-        assertEmpty(change.getUpdatedData());
-        assertEmpty(change.getRemovedPaths());
+    protected void replaceTopLevelNestedVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
     }
 
     @Override
-    protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException,
-            ExecutionException {
+    protected void putTopLevelWithTwoNestedSetup(final DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL));
+    }
 
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
+    @Override
+    protected void putTopLevelWithTwoNestedVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
+    }
 
-        assertEmpty(change.getCreatedData());
-        assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO));
-        assertContains(change.getRemovedPaths(), path(FOO, BAZ));
+    @Override
+    protected void twoNestedExistsOneIsDeletedSetup(DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL), subtreeModified(TOP_LEVEL));
     }
 
     @Override
-    protected void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException,
-            ExecutionException {
+    protected void twoNestedExistsOneIsDeletedVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
+    }
 
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
+    @Override
+    protected void nestedListExistsRootDeletedSetup(DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL), deleted(TOP_LEVEL));
+    }
 
-        assertEmpty(change.getCreatedData());
-        assertEmpty(change.getUpdatedData());
-        assertContains(change.getRemovedPaths(), TOP_LEVEL, path(FOO), path(FOO, BAR), path(FOO, BAZ));
+    @Override
+    protected void nestedListExistsRootDeletedVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
     }
 
     @Override
-    protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException {
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
+    protected void existingOneNestedWriteAdditionalNestedSetup(DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL), subtreeModified(TOP_LEVEL));
+    }
 
-        assertContains(change.getCreatedData(), path(FOO,BAZ));
-        assertNotContains(change.getCreatedData(), path(FOO,BAR));
-        assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO));
-        assertEmpty(change.getRemovedPaths());
+    @Override
+    protected void existingOneNestedWriteAdditionalNestedVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
     }
 
     @Override
-    protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException {
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
+    protected void existingTopWriteTwoNestedSetup(DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL), subtreeModified(TOP_LEVEL));
+    }
 
-        assertContains(change.getCreatedData(), path(FOO,BAR),path(FOO,BAZ));
-        assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO));
-        assertNotContains(change.getUpdatedData(), path(FOO,BAR));
-        assertEmpty(change.getRemovedPaths());
+    @Override
+    protected void existingTopWriteTwoNestedVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
     }
 
     @Override
-    protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException {
-        AsyncDataChangeEvent<InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().get();
+    protected void existingTopWriteSiblingSetup(DatastoreTestTask task) {
+        task.changeListener(TOP_LEVEL, added(TOP_LEVEL), subtreeModified(TOP_LEVEL));
+    }
 
-        assertContains(change.getCreatedData(), path(FOO_SIBLING));
-        assertContains(change.getUpdatedData(), TOP_LEVEL);
-        assertNotContains(change.getUpdatedData(), path(FOO));
-        assertEmpty(change.getRemovedPaths());
+    @Override
+    protected void existingTopWriteSiblingVerify(final DatastoreTestTask task) {
+        task.verifyChangeEvents();
     }
 }