Convert DCL tests to use DTCL

[controller.git] / opendaylight / md-sal / sal-inmemory-datastore / src / test / java / org / opendaylight / controller / md / sal / dom / store / impl / DefaultDataTreeChangeListenerTestSuite.java

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataTreeChangeListenerTestSuite.java
similarity index 54%
rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java
rename to opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataTreeChangeListenerTestSuite.java
index 74014493fa217cdad17643e964c0e364eb0d72c7..2e9204420c37794ea14cd683a8cd8535989fbbde 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataTreeChangeListenerTestSuite.java
@@ -10,40 +10,37 @@ package org.opendaylight.controller.md.sal.dom.store.impl;
 import org.junit.Test;
 
 /**
- * Base template for a test suite for testing DataChangeListener functionality.
+ * Base template for a test suite for testing DataTreeChangeListener functionality.
  */
-public abstract class DefaultDataChangeListenerTestSuite extends AbstractDataChangeListenerTest {
+public abstract class DefaultDataTreeChangeListenerTestSuite extends AbstractDataTreeChangeListenerTest {
 
     protected static final String FOO_SIBLING = "foo-sibling";
 
-    /**
-     * Callback invoked when the test suite can modify task parameters.
-     *
-     * @param task Update task configuration as needed
-     */
-    protected abstract void customizeTask(DatastoreTestTask task);
-
     @Test
     public final void putTopLevelOneNested() throws Exception {
 
         DatastoreTestTask task = newTestTask().test(writeOneTopMultipleNested(FOO, BAR));
-        customizeTask(task);
+        putTopLevelOneNestedSetup(task);
         task.run();
-        putTopLevelOneNested(task);
+        putTopLevelOneNestedVerify(task);
     }
 
-    protected abstract void putTopLevelOneNested(DatastoreTestTask task) throws Exception;
+    protected abstract void putTopLevelOneNestedSetup(DatastoreTestTask task);
+
+    protected abstract void putTopLevelOneNestedVerify(DatastoreTestTask task);
 
     @Test
     public final void existingTopWriteSibling() throws Exception {
         DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO)).test(
             tx -> tx.write(path(FOO_SIBLING), topLevelList(FOO_SIBLING).build()));
-        customizeTask(task);
+        existingTopWriteSiblingSetup(task);
         task.run();
-        existingTopWriteSibling(task);
+        existingTopWriteSiblingVerify(task);
     }
 
-    protected abstract void existingTopWriteSibling(DatastoreTestTask task) throws Exception;
+    protected abstract void existingTopWriteSiblingSetup(DatastoreTestTask task);
+
+    protected abstract void existingTopWriteSiblingVerify(DatastoreTestTask task);
 
     @Test
     public final void existingTopWriteTwoNested() throws Exception {
@@ -52,68 +49,80 @@ public abstract class DefaultDataChangeListenerTestSuite extends AbstractDataCha
                 tx.write(path(FOO,BAR), nestedList(BAR).build());
                 tx.write(path(FOO,BAZ), nestedList(BAZ).build());
             });
-        customizeTask(task);
+        existingTopWriteTwoNestedSetup(task);
         task.run();
-        existingTopWriteTwoNested(task);
+        existingTopWriteTwoNestedVerify(task);
     }
 
-    protected abstract void existingTopWriteTwoNested(DatastoreTestTask task) throws Exception;
+    protected abstract void existingTopWriteTwoNestedSetup(DatastoreTestTask task);
+
+    protected abstract void existingTopWriteTwoNestedVerify(DatastoreTestTask task);
 
 
     @Test
     public final void existingOneNestedWriteAdditionalNested() throws Exception {
         DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO, BAR)).test(
             tx -> tx.write(path(FOO,BAZ), nestedList(BAZ).build()));
-        customizeTask(task);
+        existingOneNestedWriteAdditionalNestedSetup(task);
         task.run();
-        existingOneNestedWriteAdditionalNested(task);
+        existingOneNestedWriteAdditionalNestedVerify(task);
     }
 
-    protected abstract void existingOneNestedWriteAdditionalNested(DatastoreTestTask task) throws Exception;
+    protected abstract void existingOneNestedWriteAdditionalNestedSetup(DatastoreTestTask task);
+
+    protected abstract void existingOneNestedWriteAdditionalNestedVerify(DatastoreTestTask task);
 
     @Test
     public final void replaceTopLevelNestedChanged() throws Exception {
         DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO, BAR)).test(
                 writeOneTopMultipleNested(FOO, BAZ));
-        customizeTask(task);
+        replaceTopLevelNestedSetup(task);
         task.run();
-        replaceTopLevelNestedChanged(task);
+        replaceTopLevelNestedVerify(task);
     }
 
-    protected abstract void replaceTopLevelNestedChanged(DatastoreTestTask task) throws Exception;
+    protected abstract void replaceTopLevelNestedSetup(DatastoreTestTask task);
+
+    protected abstract void replaceTopLevelNestedVerify(DatastoreTestTask task);
 
     @Test
     public final void putTopLevelWithTwoNested() throws Exception {
 
         DatastoreTestTask task = newTestTask().test(writeOneTopMultipleNested(FOO, BAR, BAZ));
-        customizeTask(task);
+        putTopLevelWithTwoNestedSetup(task);
         task.run();
-        putTopLevelWithTwoNested(task);
+        putTopLevelWithTwoNestedVerify(task);
     }
 
-    protected abstract void putTopLevelWithTwoNested(DatastoreTestTask task) throws Exception;
+    protected abstract void putTopLevelWithTwoNestedSetup(DatastoreTestTask task);
+
+    protected abstract void putTopLevelWithTwoNestedVerify(DatastoreTestTask task);
 
     @Test
     public final void twoNestedExistsOneIsDeleted() throws Exception {
 
         DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO, BAR, BAZ)).test(
                 deleteNested(FOO, BAZ));
-        customizeTask(task);
+        twoNestedExistsOneIsDeletedSetup(task);
         task.run();
-        twoNestedExistsOneIsDeleted(task);
+        twoNestedExistsOneIsDeletedVerify(task);
     }
 
-    protected abstract void twoNestedExistsOneIsDeleted(DatastoreTestTask task) throws Exception;
+    protected abstract void twoNestedExistsOneIsDeletedSetup(DatastoreTestTask task);
+
+    protected abstract void twoNestedExistsOneIsDeletedVerify(DatastoreTestTask task);
 
     @Test
     public final void nestedListExistsRootDeleted() throws Exception {
 
         DatastoreTestTask task = newTestTask().cleanup(null).setup(writeOneTopMultipleNested(FOO, BAR, BAZ))
                 .test(DatastoreTestTask.simpleDelete(TOP_LEVEL));
-        customizeTask(task);
+        nestedListExistsRootDeletedSetup(task);
         task.run();
-        nestedListExistsRootDeleted(task);
+        nestedListExistsRootDeletedVerify(task);
     }
 
-    protected abstract void nestedListExistsRootDeleted(DatastoreTestTask task) throws Exception;
+    protected abstract void nestedListExistsRootDeletedSetup(DatastoreTestTask task);
+
+    protected abstract void nestedListExistsRootDeletedVerify(DatastoreTestTask task);
 }