* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.datastore.utils;
import static org.junit.Assert.assertEquals;
import static org.opendaylight.controller.md.cluster.datastore.model.TestModel.innerNode;
import static org.opendaylight.controller.md.cluster.datastore.model.TestModel.outerNode;
import static org.opendaylight.controller.md.cluster.datastore.model.TestModel.outerNodeEntry;
-import com.google.common.base.Optional;
+
import com.google.common.reflect.Reflection;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.Optional;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.controller.cluster.datastore.Shard;
import org.opendaylight.controller.cluster.datastore.ShardDataTree;
+import org.opendaylight.controller.cluster.datastore.node.utils.transformer.ReusableNormalizedNodePruner;
import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel;
import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModificationCursor;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TipProducingDataTree;
import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.SchemaValidationFailedException;
+import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+@RunWith(MockitoJUnitRunner.class)
public class PruningDataTreeModificationTest {
- static final SchemaContext SCHEMA_CONTEXT = SchemaContextHelper.select(SchemaContextHelper.CARS_YANG,
- SchemaContextHelper.ODL_DATASTORE_TEST_YANG);
-
static final QName INVALID_TEST_QNAME = QName.create(TestModel.TEST_QNAME, "invalid");
static final YangInstanceIdentifier INVALID_TEST_PATH = YangInstanceIdentifier.of(INVALID_TEST_QNAME);
+ private static SchemaContext SCHEMA_CONTEXT;
+ private static DataSchemaContextTree CONTEXT_TREE;
+
@Mock
private DataTreeModification mockModification;
- private TipProducingDataTree dataTree;
+ private DataTree dataTree;
private DataTreeModification realModification;
private DataTreeModification proxyModification;
private PruningDataTreeModification pruningDataTreeModification;
- @Before
- public void setUp(){
- MockitoAnnotations.initMocks(this);
+ @BeforeClass
+ public static void beforeClass() {
+ SCHEMA_CONTEXT = SchemaContextHelper.select(SchemaContextHelper.CARS_YANG,
+ SchemaContextHelper.ODL_DATASTORE_TEST_YANG);
+ CONTEXT_TREE = DataSchemaContextTree.from(SCHEMA_CONTEXT);
+ }
- dataTree = InMemoryDataTreeFactory.getInstance().create(TreeType.CONFIGURATION);
- dataTree.setSchemaContext(SCHEMA_CONTEXT);
+ @Before
+ @SuppressWarnings("checkstyle:avoidHidingCauseException")
+ public void setUp() {
+ dataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION,
+ SCHEMA_CONTEXT);
realModification = dataTree.takeSnapshot().newModification();
- proxyModification = Reflection.newProxy(DataTreeModification.class, new InvocationHandler() {
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- try {
- method.invoke(mockModification, args);
- return method.invoke(realModification, args);
- } catch (InvocationTargetException e) {
- throw e.getCause();
- }
+ proxyModification = Reflection.newProxy(DataTreeModification.class, (proxy, method, args) -> {
+ try {
+ method.invoke(mockModification, args);
+ return method.invoke(realModification, args);
+ } catch (InvocationTargetException e) {
+ throw e.getCause();
}
});
- pruningDataTreeModification = new PruningDataTreeModification(proxyModification, dataTree, SCHEMA_CONTEXT);
+ pruningDataTreeModification = new PruningDataTreeModification.Reactive(proxyModification, dataTree,
+ // Cannot reuse with parallel tests
+ ReusableNormalizedNodePruner.forDataSchemaContext(CONTEXT_TREE));
}
@Test
- public void testDelete(){
+ public void testDelete() {
pruningDataTreeModification.delete(CarsModel.BASE_PATH);
verify(mockModification, times(1)).delete(CarsModel.BASE_PATH);
}
@Test
- public void testDeleteOnException(){
+ public void testDeleteOnException() {
YangInstanceIdentifier path = CarsModel.BASE_PATH;
doThrow(SchemaValidationFailedException.class).when(mockModification).delete(path);
@Test
- public void testMerge(){
+ public void testMerge() {
NormalizedNode<?, ?> normalizedNode = CarsModel.create();
YangInstanceIdentifier path = CarsModel.BASE_PATH;
pruningDataTreeModification.merge(path, normalizedNode);
}
@Test
- public void testMergeWithInvalidNamespace() throws DataValidationFailedException{
+ public void testMergeWithInvalidNamespace() throws DataValidationFailedException {
NormalizedNode<?, ?> normalizedNode = PeopleModel.emptyContainer();
YangInstanceIdentifier path = PeopleModel.BASE_PATH;
verify(mockModification, times(1)).merge(path, normalizedNode);
- DataTreeCandidateTip candidate = getCandidate();
+ DataTreeCandidate candidate = getCandidate();
assertEquals("getModificationType", ModificationType.UNMODIFIED, candidate.getRootNode().getModificationType());
}
@Test
- public void testMergeWithInvalidChildNodeNames() throws DataValidationFailedException{
+ public void testMergeWithInvalidChildNodeNames() throws DataValidationFailedException {
ContainerNode augContainer = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
new YangInstanceIdentifier.NodeIdentifier(AUG_CONTAINER)).withChild(
ImmutableNodes.containerNode(AUG_INNER_CONTAINER)).build();
DataContainerChild<?, ?> outerNode = outerNode(outerNodeEntry(1, innerNode("one", "two")));
- ContainerNode normalizedNode = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
- new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode).withChild(augContainer).
- withChild(ImmutableNodes.leafNode(AUG_QNAME, "aug")).build();
+ ContainerNode normalizedNode = ImmutableContainerNodeBuilder.create()
+ .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode)
+ .withChild(augContainer).withChild(ImmutableNodes.leafNode(AUG_QNAME, "aug")).build();
YangInstanceIdentifier path = TestModel.TEST_PATH;
new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode).build();
Optional<NormalizedNode<?, ?>> actual = dataTree.takeSnapshot().readNode(path);
- assertEquals("After pruning present", true, actual.isPresent());
+ assertTrue("After pruning present", actual.isPresent());
assertEquals("After pruning", prunedNode, actual.get());
}
@Test
- public void testMergeWithValidNamespaceAndInvalidNodeName() throws DataValidationFailedException{
+ public void testMergeWithValidNamespaceAndInvalidNodeName() throws DataValidationFailedException {
NormalizedNode<?, ?> normalizedNode = ImmutableNodes.containerNode(INVALID_TEST_QNAME);
YangInstanceIdentifier path = INVALID_TEST_PATH;
verify(mockModification, times(1)).merge(path, normalizedNode);
- DataTreeCandidateTip candidate = getCandidate();
+ DataTreeCandidate candidate = getCandidate();
assertEquals("getModificationType", ModificationType.UNMODIFIED, candidate.getRootNode().getModificationType());
}
@Test
- public void testWrite(){
+ public void testWrite() {
NormalizedNode<?, ?> normalizedNode = CarsModel.create();
YangInstanceIdentifier path = CarsModel.BASE_PATH;
pruningDataTreeModification.write(path, normalizedNode);
}
@Test
- public void testWriteRootNode() throws Exception{
- ShardDataTree shardDataTree = new ShardDataTree(SCHEMA_CONTEXT, TreeType.CONFIGURATION);
- DataTreeModification mod = shardDataTree.newModification();
+ public void testWriteRootNode() throws Exception {
+ final DataTree localDataTree = new InMemoryDataTreeFactory().create(
+ DataTreeConfiguration.DEFAULT_CONFIGURATION, SCHEMA_CONTEXT);
+ DataTreeModification mod = localDataTree.takeSnapshot().newModification();
mod.write(CarsModel.BASE_PATH, CarsModel.create());
- shardDataTree.commit(mod);
+ mod.ready();
+ localDataTree.validate(mod);
+ localDataTree.commit(localDataTree.prepare(mod));
- NormalizedNode<?, ?> normalizedNode = shardDataTree.readNode(YangInstanceIdentifier.EMPTY).get();
- pruningDataTreeModification.write(YangInstanceIdentifier.EMPTY, normalizedNode);
+ NormalizedNode<?, ?> normalizedNode = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty()).get();
+ pruningDataTreeModification.write(YangInstanceIdentifier.empty(), normalizedNode);
dataTree.commit(getCandidate());
- Optional<NormalizedNode<?, ?>> actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.EMPTY);
- assertEquals("Root present", true, actual.isPresent());
+ Optional<NormalizedNode<?, ?>> actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty());
+ assertTrue("Root present", actual.isPresent());
assertEquals("Root node", normalizedNode, actual.get());
-
}
@Test
- public void testWriteRootNodeWithInvalidChild() throws Exception{
- ShardDataTree shardDataTree = new ShardDataTree(SCHEMA_CONTEXT, TreeType.CONFIGURATION);
- NormalizedNode<?, ?> root = shardDataTree.readNode(YangInstanceIdentifier.EMPTY).get();
+ public void testWriteRootNodeWithInvalidChild() throws Exception {
+ final Shard mockShard = Mockito.mock(Shard.class);
+
+ ShardDataTree shardDataTree = new ShardDataTree(mockShard, SCHEMA_CONTEXT, TreeType.CONFIGURATION);
+ NormalizedNode<?, ?> root = shardDataTree.readNode(YangInstanceIdentifier.empty()).get();
NormalizedNode<?, ?> normalizedNode = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
new YangInstanceIdentifier.NodeIdentifier(root.getNodeType())).withChild(
ImmutableNodes.containerNode(AUG_CONTAINER)).build();
- pruningDataTreeModification.write(YangInstanceIdentifier.EMPTY, normalizedNode);
+ pruningDataTreeModification.write(YangInstanceIdentifier.empty(), normalizedNode);
dataTree.commit(getCandidate());
- Optional<NormalizedNode<?, ?>> actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.EMPTY);
+ Optional<NormalizedNode<?, ?>> actual = dataTree.takeSnapshot().readNode(YangInstanceIdentifier.empty());
assertEquals("Root present", true, actual.isPresent());
assertEquals("Root node", root, actual.get());
}
@Test
- public void testWriteWithInvalidNamespace() throws DataValidationFailedException{
+ public void testWriteWithInvalidNamespace() throws DataValidationFailedException {
NormalizedNode<?, ?> normalizedNode = PeopleModel.emptyContainer();
YangInstanceIdentifier path = PeopleModel.BASE_PATH;
verify(mockModification, times(1)).write(path, normalizedNode);
- DataTreeCandidateTip candidate = getCandidate();
+ DataTreeCandidate candidate = getCandidate();
assertEquals("getModificationType", ModificationType.UNMODIFIED, candidate.getRootNode().getModificationType());
}
@Test
- public void testWriteWithInvalidChildNodeNames() throws DataValidationFailedException{
+ public void testWriteWithInvalidChildNodeNames() throws DataValidationFailedException {
ContainerNode augContainer = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
new YangInstanceIdentifier.NodeIdentifier(AUG_CONTAINER)).withChild(
ImmutableNodes.containerNode(AUG_INNER_CONTAINER)).build();
DataContainerChild<?, ?> outerNode = outerNode(outerNodeEntry(1, innerNode("one", "two")));
- ContainerNode normalizedNode = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
- new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode).withChild(augContainer).
- withChild(ImmutableNodes.leafNode(AUG_QNAME, "aug")).
- withChild(ImmutableNodes.leafNode(NAME_QNAME, "name")).build();
+ ContainerNode normalizedNode = ImmutableContainerNodeBuilder.create()
+ .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode)
+ .withChild(augContainer).withChild(ImmutableNodes.leafNode(AUG_QNAME, "aug"))
+ .withChild(ImmutableNodes.leafNode(NAME_QNAME, "name")).build();
YangInstanceIdentifier path = TestModel.TEST_PATH;
dataTree.commit(getCandidate());
- ContainerNode prunedNode = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
- new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode).
- withChild(ImmutableNodes.leafNode(NAME_QNAME, "name")).build();
+ ContainerNode prunedNode = ImmutableContainerNodeBuilder.create()
+ .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outerNode)
+ .withChild(ImmutableNodes.leafNode(NAME_QNAME, "name")).build();
Optional<NormalizedNode<?, ?>> actual = dataTree.takeSnapshot().readNode(path);
- assertEquals("After pruning present", true, actual.isPresent());
+ assertTrue("After pruning present", actual.isPresent());
assertEquals("After pruning", prunedNode, actual.get());
}
@Test
- public void testReady(){
+ public void testReady() {
pruningDataTreeModification.ready();
verify(mockModification).ready();
}
@Test
- public void testApplyToCursor(){
+ public void testApplyToCursor() {
DataTreeModificationCursor dataTreeModificationCursor = mock(DataTreeModificationCursor.class);
pruningDataTreeModification.applyToCursor(dataTreeModificationCursor);
}
@Test
- public void testReadNode(){
+ public void testReadNode() {
pruningDataTreeModification.readNode(CarsModel.BASE_PATH);
verify(mockModification).readNode(CarsModel.BASE_PATH);
}
@Test
- public void testNewModification(){
+ public void testNewModification() {
realModification.ready();
DataTreeModification dataTreeModification = pruningDataTreeModification.newModification();
- assertTrue("new modification not of type PruningDataTreeModification", dataTreeModification instanceof PruningDataTreeModification);
+ assertTrue("new modification not of type PruningDataTreeModification",
+ dataTreeModification instanceof PruningDataTreeModification);
}
- private DataTreeCandidateTip getCandidate() throws DataValidationFailedException {
+ private DataTreeCandidate getCandidate() throws DataValidationFailedException {
pruningDataTreeModification.ready();
- DataTreeModification mod = pruningDataTreeModification.getResultingModification();
+ DataTreeModification mod = pruningDataTreeModification.delegate();
mod = mod == proxyModification ? realModification : mod;
dataTree.validate(mod);
- DataTreeCandidateTip candidate = dataTree.prepare(mod);
- return candidate;
+ return dataTree.prepare(mod);
}
-}
\ No newline at end of file
+}
Code Review / controller.git / blobdiff