X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2Ftree%2FModificationMetadataTreeTest.java;h=0f1ead33089e0b08c1ec8db868116e3350545b44;hb=1eb87c819cc6881ca7be74917a5d0bb7a9cad41f;hp=2896675c156a0ddc5c2be0612d140dad75ed9c26;hpb=153362f50d57c7e3b39e07b626d8acf238aa88ed;p=yangtools.git diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java index 2896675c15..0f1ead3308 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -16,6 +16,7 @@ import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.ma import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapEntryBuilder; import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapNodeBuilder; +import com.google.common.base.Optional; import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -25,19 +26,15 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; +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.TreeType; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; 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.model.api.SchemaContext; - -import com.google.common.base.Optional; - - - - - +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; /** * @@ -101,10 +98,10 @@ public class ModificationMetadataTreeTest { private RootModificationApplyOperation rootOper; @Before - public void prepare() { + public void prepare() throws ReactorException { schemaContext = TestModel.createTestContext(); assertNotNull("Schema context must not be null.", schemaContext); - rootOper = RootModificationApplyOperation.from(SchemaAwareApplyOperation.from(schemaContext)); + rootOper = RootModificationApplyOperation.from(SchemaAwareApplyOperation.from(schemaContext, DataTreeConfiguration.DEFAULT_OPERATIONAL)); } /** @@ -123,7 +120,7 @@ public class ModificationMetadataTreeTest { * * * - * @return + * @return a test document */ public NormalizedNode createDocumentOne() { return ImmutableContainerNodeBuilder @@ -133,7 +130,7 @@ public class ModificationMetadataTreeTest { } - private ContainerNode createTestContainer() { + private static ContainerNode createTestContainer() { return ImmutableContainerNodeBuilder .create() .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME)) @@ -145,10 +142,10 @@ public class ModificationMetadataTreeTest { @Test public void basicReadWrites() { - DataTreeModification modificationTree = new InMemoryDataTreeModification(new InMemoryDataTreeSnapshot(schemaContext, + final DataTreeModification modificationTree = new InMemoryDataTreeModification(new InMemoryDataTreeSnapshot(schemaContext, TreeNodeFactory.createTreeNodeRecursively(createDocumentOne(), Version.initial()), rootOper), rootOper); - Optional> originalBarNode = modificationTree.readNode(OUTER_LIST_2_PATH); + final Optional> originalBarNode = modificationTree.readNode(OUTER_LIST_2_PATH); assertTrue(originalBarNode.isPresent()); assertSame(BAR_NODE, originalBarNode.get()); @@ -157,13 +154,13 @@ public class ModificationMetadataTreeTest { // reads node to /outer-list/1/inner_list/two/value // and checks if node is already present - Optional> barTwoCModified = modificationTree.readNode(TWO_TWO_VALUE_PATH); + final Optional> barTwoCModified = modificationTree.readNode(TWO_TWO_VALUE_PATH); assertTrue(barTwoCModified.isPresent()); assertEquals(ImmutableNodes.leafNode(TestModel.VALUE_QNAME, "test"), barTwoCModified.get()); // delete node to /outer-list/1/inner_list/two/value modificationTree.delete(TWO_TWO_VALUE_PATH); - Optional> barTwoCAfterDelete = modificationTree.readNode(TWO_TWO_VALUE_PATH); + final Optional> barTwoCAfterDelete = modificationTree.readNode(TWO_TWO_VALUE_PATH); assertFalse(barTwoCAfterDelete.isPresent()); } @@ -172,7 +169,7 @@ public class ModificationMetadataTreeTest { /** * Creates empty Snapshot with associated schema context. */ - DataTree t = InMemoryDataTreeFactory.getInstance().create(); + final DataTree t = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL); t.setSchemaContext(schemaContext); /** @@ -187,7 +184,7 @@ public class ModificationMetadataTreeTest { @Test public void createFromEmptyState() { - DataTreeModification modificationTree = createEmptyModificationTree(); + final DataTreeModification modificationTree = createEmptyModificationTree(); /** * Writes empty container node to /test * @@ -202,15 +199,15 @@ public class ModificationMetadataTreeTest { /** * Reads list node from /test/outer-list */ - Optional> potentialOuterList = modificationTree.readNode(TestModel.OUTER_LIST_PATH); + final Optional> potentialOuterList = modificationTree.readNode(TestModel.OUTER_LIST_PATH); assertTrue(potentialOuterList.isPresent()); /** * Reads container node from /test and verifies that it contains test * node */ - Optional> potentialTest = modificationTree.readNode(TestModel.TEST_PATH); - ContainerNode containerTest = assertPresentAndType(potentialTest, ContainerNode.class); + final Optional> potentialTest = modificationTree.readNode(TestModel.TEST_PATH); + final ContainerNode containerTest = assertPresentAndType(potentialTest, ContainerNode.class); /** * @@ -224,23 +221,23 @@ public class ModificationMetadataTreeTest { @Test public void writeSubtreeReadChildren() { - DataTreeModification modificationTree = createEmptyModificationTree(); + final DataTreeModification modificationTree = createEmptyModificationTree(); modificationTree.write(TestModel.TEST_PATH, createTestContainer()); - Optional> potential = modificationTree.readNode(TWO_TWO_PATH); + final Optional> potential = modificationTree.readNode(TWO_TWO_PATH); assertPresentAndType(potential, MapEntryNode.class); } @Test public void writeSubtreeDeleteChildren() { - DataTreeModification modificationTree = createEmptyModificationTree(); + final DataTreeModification modificationTree = createEmptyModificationTree(); modificationTree.write(TestModel.TEST_PATH, createTestContainer()); // We verify data are present - Optional> potentialBeforeDelete = modificationTree.readNode(TWO_TWO_PATH); + final Optional> potentialBeforeDelete = modificationTree.readNode(TWO_TWO_PATH); assertPresentAndType(potentialBeforeDelete, MapEntryNode.class); modificationTree.delete(TWO_TWO_PATH); - Optional> potentialAfterDelete = modificationTree.readNode(TWO_TWO_PATH); + final Optional> potentialAfterDelete = modificationTree.readNode(TWO_TWO_PATH); assertFalse(potentialAfterDelete.isPresent()); }