X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-dom-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fdata%2FWildcardedDataChangeListenerTest.java;h=4f11c50e53ddd656749afd6e4913395ec5431ee7;hp=e0a151adc0d729d4ab65f22aa6072d279a1cd9ac;hb=97f90cb2c7865665e6f152bec1f82f4ad784b389;hpb=f39ec0eea4ce3f2a9be935887097a7e974adf5e0 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 e0a151adc0..4f11c50e53 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,19 +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 com.google.common.util.concurrent.SettableFuture; +import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.OPERATIONAL; + +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.common.api.data.DataChangeEvent; -import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; -import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; -import org.opendaylight.controller.sal.binding.test.AbstractDataServiceTest; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +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; @@ -31,149 +32,126 @@ 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 { +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 { - DataProviderService dataBroker = testContext.getBindingDataBroker(); - - final SettableFuture, DataObject>> eventFuture = SettableFuture.create(); - dataBroker.registerDataChangeListener(DEEP_WILDCARDED_PATH, new DataChangeListener() { - @Override - public void onDataChanged(final DataChangeEvent, DataObject> dataChangeEvent) { - eventFuture.set(dataChangeEvent); - } - }); + DataBroker dataBroker = getDataBroker(); - DataModificationTransaction transaction = dataBroker.beginTransaction(); - transaction.putOperationalData(NODE_0_CWU_PATH, CWU); - transaction.putOperationalData(NODE_0_LVU_PATH, LVU); - transaction.putOperationalData(NODE_1_LVU_PATH, LVU); - transaction.commit().get(); + 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())); - DataChangeEvent, DataObject> event = eventFuture.get(1000, TimeUnit.MILLISECONDS); + final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); + 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); - validateEvent(event); + listener.verify(); } @Test public void testWriteByReplace() throws InterruptedException, TimeoutException, ExecutionException { - DataProviderService dataBroker = testContext.getBindingDataBroker(); + DataBroker dataBroker = getDataBroker(); - final SettableFuture, DataObject>> eventFuture = SettableFuture.create(); - dataBroker.registerDataChangeListener(DEEP_WILDCARDED_PATH, new DataChangeListener() { - @Override - public void onDataChanged(final DataChangeEvent, DataObject> dataChangeEvent) { - eventFuture.set(dataChangeEvent); - } - }); + 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())); - DataModificationTransaction cwuTx = dataBroker.beginTransaction(); - cwuTx.putOperationalData(NODE_0_CWU_PATH, CWU); - cwuTx.commit().get(); + final WriteTransaction cwuTx = dataBroker.newWriteOnlyTransaction(); + 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()); - DataModificationTransaction lvuTx = dataBroker.beginTransaction(); + final WriteTransaction lvuTx = dataBroker.newWriteOnlyTransaction(); TreeComplexUsesAugment tcua = new TreeComplexUsesAugmentBuilder() .setListViaUses(Collections.singletonList(LVU)).build(); - lvuTx.putOperationalData(NODE_0_TCU_PATH, tcua); - lvuTx.putOperationalData(NODE_1_LVU_PATH, LVU); - lvuTx.commit().get(); + 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 { - - DataProviderService dataBroker = testContext.getBindingDataBroker(); - - // We wrote initial state NODE_0_FLOW - DataModificationTransaction transaction = dataBroker.beginTransaction(); - transaction.putOperationalData(NODE_0_LVU_PATH, LVU); - transaction.commit().get(); - - // We registered DataChangeListener - final SettableFuture, DataObject>> eventFuture = SettableFuture.create(); - dataBroker.registerDataChangeListener(DEEP_WILDCARDED_PATH, new DataChangeListener() { - - @Override - public void onDataChanged(final DataChangeEvent, DataObject> dataChangeEvent) { - eventFuture.set(dataChangeEvent); - } - }); - assertFalse(eventFuture.isDone()); - - DataModificationTransaction secondTx = dataBroker.beginTransaction(); - secondTx.putOperationalData(NODE_0_LVU_PATH, LVU); - secondTx.putOperationalData(NODE_1_LVU_PATH, LVU); - secondTx.commit().get(); - - DataChangeEvent, DataObject> event = (eventFuture.get(1000, TimeUnit.MILLISECONDS)); - assertNotNull(event); - // Data change should contains NODE_1 Flow - which was added - assertTrue(event.getCreatedOperationalData().containsKey(NODE_1_LVU_PATH)); - // Data change must not containe NODE_0 Flow which was replaced with same value. - assertFalse(event.getUpdatedOperationalData().containsKey(NODE_0_LVU_PATH)); - } + public void testChangeOnReplaceWithSameValue() throws InterruptedException, TimeoutException, ExecutionException { - private static void validateEvent(final DataChangeEvent, DataObject> event) { - assertNotNull(event); - assertTrue(event.getCreatedOperationalData().containsKey(NODE_1_LVU_PATH)); - assertTrue(event.getCreatedOperationalData().containsKey(NODE_0_LVU_PATH)); - assertFalse(event.getCreatedOperationalData().containsKey(NODE_0_CWU_PATH)); - } + DataBroker dataBroker = getDataBroker(); + + // Write initial state NODE_0_FLOW + final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); + transaction.put(OPERATIONAL, NODE_0_LVU_PATH, LVU, true); + transaction.submit().get(5, TimeUnit.SECONDS); + 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(OPERATIONAL, NODE_0_LVU_PATH, LVU, true); + secondTx.put(OPERATIONAL, NODE_1_LVU_PATH, LVU, true); + secondTx.submit().get(5, TimeUnit.SECONDS); + + listener.verify(); + } }