X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2Ftest%2FBug1333DataChangeListenerTest.java;fp=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2Ftest%2FBug1333DataChangeListenerTest.java;h=c7ba0abadefe63cb59df387493ff5e50319ad75e;hb=ffb48e89507f417d52b7a86d6c34f9af7f955477;hp=60d56db5819b154de988fe23602fdae3c6c265eb;hpb=c9e43c3fa7ecc66546afb7eda8a1b5d5b15f4120;p=mdsal.git

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java
similarity index 80%
rename from opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java
rename to binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java
index 60d56db581..c7ba0abade 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java
@@ -25,9 +25,9 @@ import org.opendaylight.controller.md.sal.binding.test.AbstractDataChangeListene
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeComplexUsesAugment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top;
-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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelList;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -48,26 +48,26 @@ public class Bug1333DataChangeListenerTest extends AbstractDataChangeListenerTes
             TreeComplexUsesAugment.class);
 
     public void writeTopWithListItem(final LogicalDatastoreType store) {
-        ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction();
-        Top topItem = top(topLevelList(TOP_FOO_KEY, complexUsesAugment(USES_ONE_KEY, USES_TWO_KEY)));
+        final ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction();
+        final Top topItem = top(topLevelList(TOP_FOO_KEY, complexUsesAugment(USES_ONE_KEY, USES_TWO_KEY)));
         tx.put(store, TOP_PATH, topItem);
         assertCommit(tx.submit());
     }
 
     public void deleteItem(final LogicalDatastoreType store, final InstanceIdentifier<?> path) {
-        ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction();
+        final ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction();
         tx.delete(store, path);
         assertCommit(tx.submit());
     }
 
     @Test
     public void writeTopWithListItemAugmentedListenTopSubtree() {
-        TestListener listener = createListener(CONFIGURATION,TOP_PATH, DataChangeScope.SUBTREE);
+        final TestListener listener = createListener(CONFIGURATION,TOP_PATH, DataChangeScope.SUBTREE);
         listener.startCapture();
 
         writeTopWithListItem(CONFIGURATION);
 
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
+        final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
 
         assertContains(event.getCreatedData(), TOP_PATH);
         assertContains(event.getCreatedData(), path(TOP_FOO_KEY));
@@ -81,11 +81,11 @@ public class Bug1333DataChangeListenerTest extends AbstractDataChangeListenerTes
 
     @Test
     public void writeTopWithListItemAugmentedListenAugmentSubtreeWildcarded() {
-        TestListener listener = createListener(CONFIGURATION,AUGMENT_WILDCARD, DataChangeScope.SUBTREE);
+        final TestListener listener = createListener(CONFIGURATION,AUGMENT_WILDCARD, DataChangeScope.SUBTREE);
         listener.startCapture();
         writeTopWithListItem(CONFIGURATION);
 
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
+        final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
 
         /*
          * Event should not contain parent nodes
@@ -103,11 +103,11 @@ public class Bug1333DataChangeListenerTest extends AbstractDataChangeListenerTes
     @Test
     public void deleteAugmentChildListenTopSubtree() {
         writeTopWithListItem(CONFIGURATION);
-        TestListener listener = createListener(CONFIGURATION, TOP_PATH, DataChangeScope.SUBTREE);
-        InstanceIdentifier<?> deletePath = path(TOP_FOO_KEY,USES_ONE_KEY);
+        final TestListener listener = createListener(CONFIGURATION, TOP_PATH, DataChangeScope.SUBTREE);
+        final InstanceIdentifier<?> deletePath = path(TOP_FOO_KEY,USES_ONE_KEY);
         deleteItem(CONFIGURATION,deletePath);
 
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
+        final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
 
 
         assertEmpty(event.getCreatedData());
@@ -125,10 +125,10 @@ public class Bug1333DataChangeListenerTest extends AbstractDataChangeListenerTes
     public void deleteAugmentChildListenAugmentSubtreeWildcarded() {
         writeTopWithListItem(CONFIGURATION);
 
-        TestListener listener = createListener(CONFIGURATION, AUGMENT_WILDCARD, DataChangeScope.SUBTREE);
-        InstanceIdentifier<?> deletePath = path(TOP_FOO_KEY,USES_ONE_KEY);
+        final TestListener listener = createListener(CONFIGURATION, AUGMENT_WILDCARD, DataChangeScope.SUBTREE);
+        final InstanceIdentifier<?> deletePath = path(TOP_FOO_KEY,USES_ONE_KEY);
         deleteItem(CONFIGURATION,deletePath);
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
+        final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event = listener.event();
 
         assertEmpty(event.getCreatedData());