Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adjust for Binding RPC codegen changes
[controller.git]
/
opendaylight
/
md-sal
/
sal-inmemory-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
dom
/
store
/
impl
/
WildcardedScopeSubtreeTest.java
diff --git
a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java
b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java
index 010204888b85a6ad92f6971f0b4df75e5454e28b..31a9f9c979566e5828b2abf4efb0bf03cbe2e46a 100644
(file)
--- a/
opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java
+++ b/
opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java
@@
-11,17
+11,15
@@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import java.util.concurrent.ExecutionException;
-
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
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.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
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.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.
Yang
InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSuite {
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSuite {
- private static final InstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node(
+ private static final
Yang
InstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node(
TopLevelList.QNAME);
@Override
TopLevelList.QNAME);
@Override
@@
-30,9
+28,9
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- public void putTopLevelOneNested(final DatastoreTestTask task) throws
InterruptedException, Execution
Exception {
+ public void putTopLevelOneNested(final DatastoreTestTask task) throws Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertNotContains(change.getCreatedData(), TOP_LEVEL);
assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR));
assertNotContains(change.getCreatedData(), TOP_LEVEL);
assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR));
@@
-42,10
+40,9
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException,
- ExecutionException {
+ public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertNotNull(change);
assertContains(change.getCreatedData(), path(FOO, BAZ));
assertNotNull(change);
assertContains(change.getCreatedData(), path(FOO, BAZ));
@@
-56,10
+53,9
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException,
- ExecutionException {
+ protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertNotNull(change);
assertFalse(change.getCreatedData().isEmpty());
assertNotNull(change);
assertFalse(change.getCreatedData().isEmpty());
@@
-71,10
+67,9
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException,
- ExecutionException {
+ protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertNotNull(change);
assertTrue(change.getCreatedData().isEmpty());
assertContains(change.getUpdatedData(), path(FOO));
assertNotNull(change);
assertTrue(change.getCreatedData().isEmpty());
assertContains(change.getUpdatedData(), path(FOO));
@@
-83,10
+78,9
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException,
- ExecutionException {
+ public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertEmpty(change.getCreatedData());
assertEmpty(change.getUpdatedData());
assertEmpty(change.getCreatedData());
assertEmpty(change.getUpdatedData());
@@
-96,8
+90,8
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) throws
InterruptedException, Execution
Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) throws Exception {
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertContains(change.getCreatedData(), path(FOO,BAZ));
assertNotContains(change.getCreatedData(), path(FOO,BAR));
assertContains(change.getCreatedData(), path(FOO,BAZ));
assertNotContains(change.getCreatedData(), path(FOO,BAR));
@@
-107,8
+101,8
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws
InterruptedException, Execution
Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws Exception {
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertContains(change.getCreatedData(), path(FOO,BAR),path(FOO,BAZ));
assertContains(change.getUpdatedData(), path(FOO));
assertContains(change.getCreatedData(), path(FOO,BAR),path(FOO,BAZ));
assertContains(change.getUpdatedData(), path(FOO));
@@
-117,8
+111,8
@@
public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui
}
@Override
}
@Override
- protected void existingTopWriteSibling(final DatastoreTestTask task) throws
InterruptedException, Execution
Exception {
- AsyncDataChangeEvent<
InstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEvent().ge
t();
+ protected void existingTopWriteSibling(final DatastoreTestTask task) throws Exception {
+ AsyncDataChangeEvent<
YangInstanceIdentifier, NormalizedNode<?, ?>> change = task.getChangeEven
t();
assertContains(change.getCreatedData(), path(FOO_SIBLING));
assertNotContains(change.getUpdatedData(), path(FOO), TOP_LEVEL);
assertContains(change.getCreatedData(), path(FOO_SIBLING));
assertNotContains(change.getUpdatedData(), path(FOO), TOP_LEVEL);