X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-dom-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fdata%2FWildcardedDataChangeListenerTest.java;h=13f36f172173da436c0539999660419aace0a37f;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hp=e9f0b203a7fec9493f1c6533bdcd715a5d1490fe;hpb=3a25fec0b812950c61d2fb6018407a2a6ceb5090;p=controller.git diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java index e9f0b203a7..13f36f1721 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java @@ -8,21 +8,20 @@ package org.opendaylight.controller.md.sal.binding.data; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.OPERATIONAL; -import com.google.common.util.concurrent.SettableFuture; +import com.google.common.collect.ImmutableSet; +import com.google.common.util.concurrent.Uninterruptibles; import java.util.Collections; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -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.controller.sal.binding.test.AbstractDataServiceTest; +import org.opendaylight.controller.md.sal.binding.test.AbstractDataTreeChangeListenerTest; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; 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.augment.rev140709.TreeComplexUsesAugmentBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.complex.from.grouping.ContainerWithUses; @@ -33,139 +32,124 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll 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.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -/** - * FIXME: THis test should be moved to compat test-suite - */ -public class WildcardedDataChangeListenerTest extends AbstractDataServiceTest { +// FIXME: This test should be moved to compat test-suite +public class WildcardedDataChangeListenerTest extends AbstractDataTreeChangeListenerTest { private static final TopLevelListKey TOP_LEVEL_LIST_0_KEY = new TopLevelListKey("test:0"); private static final TopLevelListKey TOP_LEVEL_LIST_1_KEY = new TopLevelListKey("test:1"); protected static final InstanceIdentifier DEEP_WILDCARDED_PATH = InstanceIdentifier .builder(Top.class) - .child(TopLevelList.class) // - .augmentation(TreeComplexUsesAugment.class) // - .child(ListViaUses.class) // + .child(TopLevelList.class) + .augmentation(TreeComplexUsesAugment.class) + .child(ListViaUses.class) .build(); private static final InstanceIdentifier NODE_0_TCU_PATH = InstanceIdentifier .builder(Top.class) - .child(TopLevelList.class, TOP_LEVEL_LIST_0_KEY) // - .augmentation(TreeComplexUsesAugment.class) // + .child(TopLevelList.class, TOP_LEVEL_LIST_0_KEY) + .augmentation(TreeComplexUsesAugment.class) .build(); private static final InstanceIdentifier NODE_1_TCU_PATH = InstanceIdentifier .builder(Top.class) - .child(TopLevelList.class, TOP_LEVEL_LIST_1_KEY) // - .augmentation(TreeComplexUsesAugment.class) // + .child(TopLevelList.class, TOP_LEVEL_LIST_1_KEY) + .augmentation(TreeComplexUsesAugment.class) .build(); private static final ListViaUsesKey LIST_VIA_USES_KEY = new ListViaUsesKey("test"); - private static final InstanceIdentifier NODE_0_LVU_PATH = NODE_0_TCU_PATH.child(ListViaUses.class, LIST_VIA_USES_KEY); + private static final InstanceIdentifier NODE_0_LVU_PATH = NODE_0_TCU_PATH.child(ListViaUses.class, + LIST_VIA_USES_KEY); - private static final InstanceIdentifier NODE_1_LVU_PATH = NODE_1_TCU_PATH.child(ListViaUses.class, LIST_VIA_USES_KEY); + private static final InstanceIdentifier NODE_1_LVU_PATH = NODE_1_TCU_PATH.child(ListViaUses.class, + LIST_VIA_USES_KEY); private static final InstanceIdentifier NODE_0_CWU_PATH = NODE_0_TCU_PATH.child(ContainerWithUses.class); - private static final ContainerWithUses CWU= new ContainerWithUsesBuilder()// - .setLeafFromGrouping("some container value") // - .build(); + private static final ContainerWithUses CWU = new ContainerWithUsesBuilder() + .setLeafFromGrouping("some container value").build(); - private static final ListViaUses LVU = new ListViaUsesBuilder() // - .setKey(LIST_VIA_USES_KEY) // - .setName("john") - .build(); + private static final ListViaUses LVU = new ListViaUsesBuilder() + .withKey(LIST_VIA_USES_KEY).setName("john").build(); + + @Override + protected Set getModuleInfos() throws Exception { + return ImmutableSet.of(BindingReflections.getModuleInfo(Top.class), + BindingReflections.getModuleInfo(TreeComplexUsesAugment.class)); + } @Test public void testSeparateWrites() throws InterruptedException, TimeoutException, ExecutionException { - DataBroker dataBroker = testContext.getDataBroker(); + DataBroker dataBroker = getDataBroker(); - final SettableFuture, DataObject>> eventFuture = - SettableFuture.create(); - dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, DEEP_WILDCARDED_PATH, - dataChangeEvent -> eventFuture.set(dataChangeEvent), DataChangeScope.SUBTREE); + final TestListener listener = createListener(OPERATIONAL, DEEP_WILDCARDED_PATH, + dataTreeModification -> NODE_0_LVU_PATH.equals(dataTreeModification.getRootPath().getRootIdentifier()), + dataTreeModification -> NODE_1_LVU_PATH.equals(dataTreeModification.getRootPath().getRootIdentifier())); final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); - transaction.put(LogicalDatastoreType.OPERATIONAL, NODE_0_CWU_PATH, CWU, true); - transaction.put(LogicalDatastoreType.OPERATIONAL, NODE_0_LVU_PATH, LVU, true); - transaction.put(LogicalDatastoreType.OPERATIONAL, NODE_1_LVU_PATH, LVU, true); + transaction.put(OPERATIONAL, NODE_0_CWU_PATH, CWU, true); + transaction.put(OPERATIONAL, NODE_0_LVU_PATH, LVU, true); + transaction.put(OPERATIONAL, NODE_1_LVU_PATH, LVU, true); transaction.submit().get(5, TimeUnit.SECONDS); - AsyncDataChangeEvent, DataObject> event = eventFuture.get(1000, TimeUnit.MILLISECONDS); - - validateEvent(event); + listener.verify(); } @Test public void testWriteByReplace() throws InterruptedException, TimeoutException, ExecutionException { - DataBroker dataBroker = testContext.getDataBroker(); + DataBroker dataBroker = getDataBroker(); - final SettableFuture, DataObject>> eventFuture = - SettableFuture.create(); - dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, DEEP_WILDCARDED_PATH, - dataChangeEvent -> eventFuture.set(dataChangeEvent), DataChangeScope.SUBTREE); + final TestListener listener = createListener(OPERATIONAL, DEEP_WILDCARDED_PATH, + dataTreeModification -> NODE_0_LVU_PATH.equals(dataTreeModification.getRootPath().getRootIdentifier()), + dataTreeModification -> NODE_1_LVU_PATH.equals(dataTreeModification.getRootPath().getRootIdentifier())); final WriteTransaction cwuTx = dataBroker.newWriteOnlyTransaction(); - cwuTx.put(LogicalDatastoreType.OPERATIONAL, NODE_0_CWU_PATH, CWU, true); + cwuTx.put(OPERATIONAL, NODE_0_CWU_PATH, CWU, true); cwuTx.submit().get(5, TimeUnit.SECONDS); - assertFalse(eventFuture.isDone()); + Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS); + assertFalse(listener.hasChanges()); final WriteTransaction lvuTx = dataBroker.newWriteOnlyTransaction(); TreeComplexUsesAugment tcua = new TreeComplexUsesAugmentBuilder() .setListViaUses(Collections.singletonList(LVU)).build(); - lvuTx.put(LogicalDatastoreType.OPERATIONAL, NODE_0_TCU_PATH, tcua, true); - lvuTx.put(LogicalDatastoreType.OPERATIONAL, NODE_1_LVU_PATH, LVU, true); + lvuTx.put(OPERATIONAL, NODE_0_TCU_PATH, tcua, true); + lvuTx.put(OPERATIONAL, NODE_1_LVU_PATH, LVU, true); lvuTx.submit().get(5, TimeUnit.SECONDS); - validateEvent(eventFuture.get(1000, TimeUnit.MILLISECONDS)); + listener.verify(); } @Test - public void testNoChangeOnReplaceWithSameValue() throws InterruptedException, TimeoutException, ExecutionException { + public void testChangeOnReplaceWithSameValue() throws InterruptedException, TimeoutException, ExecutionException { - DataBroker dataBroker = testContext.getDataBroker(); + DataBroker dataBroker = getDataBroker(); - // We wrote initial state NODE_0_FLOW + // Write initial state NODE_0_FLOW final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); - transaction.put(LogicalDatastoreType.OPERATIONAL, NODE_0_LVU_PATH, LVU, true); + transaction.put(OPERATIONAL, NODE_0_LVU_PATH, LVU, true); transaction.submit().get(5, TimeUnit.SECONDS); - // We registered DataChangeListener - final SettableFuture, DataObject>> eventFuture = - SettableFuture.create(); - dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, DEEP_WILDCARDED_PATH, - dataChangeEvent -> eventFuture.set(dataChangeEvent), DataChangeScope.SUBTREE); - assertFalse(eventFuture.isDone()); + final TestListener listener = createListener(OPERATIONAL, DEEP_WILDCARDED_PATH, + dataTreeModification -> NODE_1_LVU_PATH.equals(dataTreeModification.getRootPath().getRootIdentifier()), + dataTreeModification -> NODE_0_LVU_PATH.equals(dataTreeModification.getRootPath().getRootIdentifier()), + dataTreeModification -> NODE_1_LVU_PATH.equals(dataTreeModification.getRootPath().getRootIdentifier())); final WriteTransaction secondTx = dataBroker.newWriteOnlyTransaction(); - secondTx.put(LogicalDatastoreType.OPERATIONAL, NODE_0_LVU_PATH, LVU, true); - secondTx.put(LogicalDatastoreType.OPERATIONAL, NODE_1_LVU_PATH, LVU, true); + secondTx.put(OPERATIONAL, NODE_0_LVU_PATH, LVU, true); + secondTx.put(OPERATIONAL, NODE_1_LVU_PATH, LVU, true); secondTx.submit().get(5, TimeUnit.SECONDS); - AsyncDataChangeEvent, DataObject> event = eventFuture.get(1000, TimeUnit.MILLISECONDS); - assertNotNull(event); - // Data change should contains NODE_1 Flow - which was added - assertTrue(event.getCreatedData().containsKey(NODE_1_LVU_PATH)); - // Data change must not containe NODE_0 Flow which was replaced with same value. - assertFalse(event.getUpdatedData().containsKey(NODE_0_LVU_PATH)); - } - - private static void validateEvent(final AsyncDataChangeEvent, DataObject> event) { - assertNotNull(event); - assertTrue(event.getCreatedData().containsKey(NODE_1_LVU_PATH)); - assertTrue(event.getCreatedData().containsKey(NODE_0_LVU_PATH)); - assertFalse(event.getCreatedData().containsKey(NODE_0_CWU_PATH)); + listener.verify(); } - }