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%2Fleafref%2Fcontext%2FDataTreeCandidateValidatorTest.java;h=eee5c861c97998c10237870345fa36b2f2019ba8;hb=11f324d00534f75932df67ba737efe261271cb47;hp=1f68deff2ee3e75ab701a77074ecd6b15d45377d;hpb=2d5b39317c3c5db3fa9c4c258175340d3e347c38;p=yangtools.git diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java index 1f68deff2e..eee5c861c9 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import java.util.Set; import org.apache.log4j.BasicConfigurator; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -34,28 +33,28 @@ 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.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContext; import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefDataValidationFailedException; import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefValidation; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class DataTreeCandidateValidatorTest { - private static SchemaContext context; + private static EffectiveModelContext context; private static Module valModule; private static QNameModule valModuleQname; private static LeafRefContext rootLeafRefContext; @@ -100,11 +99,10 @@ public class DataTreeCandidateValidatorTest { } @BeforeClass - public static void init() { + public static void init() throws DataValidationFailedException { context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation"); - final Set modules = context.getModules(); - for (final Module module : modules) { + for (final Module module : context.getModules()) { if (module.getName().equals("leafref-validation")) { valModule = module; } @@ -153,8 +151,8 @@ public class DataTreeCandidateValidatorTest { final DataTreeModification initialDataTreeModification = inMemoryDataTree .takeSnapshot().newModification(); - final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule - .getDataChildByName(odl); + final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule.findDataChildByName(odl) + .get(); final ContainerNode odlProjectContainer = createOdlContainer(odlProjContSchemaNode); @@ -176,7 +174,7 @@ public class DataTreeCandidateValidatorTest { } @Test - public void dataTreeCanditateValidationTest() { + public void dataTreeCanditateValidationTest() throws DataValidationFailedException { write(); write2(); @@ -190,10 +188,10 @@ public class DataTreeCandidateValidatorTest { writeIntoMapEntry(); } - private static void writeContributors() { + private static void writeContributors() throws DataValidationFailedException { final ContainerSchemaNode contributorContSchemaNode = (ContainerSchemaNode) valModule - .getDataChildByName(odlContributor); + .findDataChildByName(odlContributor).get(); final ContainerNode contributorContainer = createBasicContributorContainer(contributorContSchemaNode); @@ -233,12 +231,11 @@ public class DataTreeCandidateValidatorTest { } - private static void writeIntoMapEntry() { + private static void writeIntoMapEntry() throws DataValidationFailedException { final Map keys = new HashMap<>(); keys.put(name, "New Project"); - final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates( - project, keys); + final NodeIdentifierWithPredicates mapEntryPath = NodeIdentifierWithPredicates.of(project, keys); final YangInstanceIdentifier leaderPath = YangInstanceIdentifier .of(odl).node(project).node(mapEntryPath).node(lead); @@ -280,20 +277,19 @@ public class DataTreeCandidateValidatorTest { } - private static void writeMapEntry() { + private static void writeMapEntry() throws DataValidationFailedException { final Map keys = new HashMap<>(); keys.put(name, "New Project"); - final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates( - project, keys); + final NodeIdentifierWithPredicates mapEntryPath = NodeIdentifierWithPredicates.of(project, keys); final YangInstanceIdentifier newOdlProjectMapEntryPath = YangInstanceIdentifier .of(odl).node(project).node(mapEntryPath); - final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule - .getDataChildByName(odl); - final ListSchemaNode projListSchemaNode = (ListSchemaNode) odlProjContSchemaNode - .getDataChildByName(project); + final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule.findDataChildByName(odl) + .get(); + final ListSchemaNode projListSchemaNode = (ListSchemaNode) odlProjContSchemaNode.findDataChildByName(project) + .get(); final MapEntryNode newProjectMapEntry = createProjectListEntry( "New Project", "New Project description ...", "Leader of New Project", "Owner of New Project", @@ -333,10 +329,10 @@ public class DataTreeCandidateValidatorTest { } - private static void write() { + private static void write() throws DataValidationFailedException { final ContainerSchemaNode contributorContSchemaNode = (ContainerSchemaNode) valModule - .getDataChildByName(odlContributor); + .findDataChildByName(odlContributor).get(); final ContainerNode contributorContainer = createContributorContainer(contributorContSchemaNode); @@ -381,14 +377,12 @@ public class DataTreeCandidateValidatorTest { assertTrue(exception); } - private static void write2() { + private static void write2() throws DataValidationFailedException { - final ContainerSchemaNode odlCon = (ContainerSchemaNode) valModule - .getDataChildByName(odl); - final ContainerSchemaNode con1Con = (ContainerSchemaNode) odlCon - .getDataChildByName(con1); + final ContainerSchemaNode odlCon = (ContainerSchemaNode) valModule.findDataChildByName(odl).get(); + final ContainerSchemaNode con1Con = (ContainerSchemaNode) odlCon.findDataChildByName(con1).get(); final LeafNode l1Leaf = ImmutableNodes.leafNode(l1, "l1 value"); - final DataContainerNodeAttrBuilder containerBuilder = Builders + final DataContainerNodeBuilder containerBuilder = Builders .containerBuilder(con1Con); containerBuilder.addChild(l1Leaf); final ContainerNode con1Node = containerBuilder.build(); @@ -472,7 +466,7 @@ public class DataTreeCandidateValidatorTest { choiceBuilder.addChild(mapBuilder.build()); - final DataContainerNodeAttrBuilder containerBuilder = Builders + final DataContainerNodeBuilder containerBuilder = Builders .containerBuilder(); containerBuilder.withNodeIdentifier(new NodeIdentifier(con3)); @@ -483,10 +477,9 @@ public class DataTreeCandidateValidatorTest { private static MapEntryNode createList3Entry(final String keyVal, final String l3Val1, final String l3Val2, final String l3Val3) { - final DataContainerNodeAttrBuilder mapEntryBuilder = Builders + final DataContainerNodeBuilder mapEntryBuilder = Builders .mapEntryBuilder(); - mapEntryBuilder.withNodeIdentifier(new NodeIdentifierWithPredicates( - list3InChoice, k, keyVal)); + mapEntryBuilder.withNodeIdentifier(NodeIdentifierWithPredicates.of(list3InChoice, k, keyVal)); final ListNodeBuilder> leafSetBuilder = Builders .leafSetBuilder(); @@ -504,7 +497,7 @@ public class DataTreeCandidateValidatorTest { private static LeafSetEntryNode createLeafSetEntry( final QName qname, final String val) { - final NormalizedNodeAttrBuilder> leafSetEntryBuilder = Builders + final NormalizedNodeBuilder> leafSetEntryBuilder = Builders .leafSetEntryBuilder(); leafSetEntryBuilder.withNodeIdentifier(new NodeWithValue<>(qname, val)); leafSetEntryBuilder.withValue(val); @@ -543,10 +536,10 @@ public class DataTreeCandidateValidatorTest { final String leafrefInChoiceVal, final String leafrefInChoiceToChoiceVal) { - final DataContainerNodeAttrBuilder mapEntryBuilder = Builders + final DataContainerNodeBuilder mapEntryBuilder = Builders .mapEntryBuilder(); - mapEntryBuilder.withNodeIdentifier(new NodeIdentifierWithPredicates( + mapEntryBuilder.withNodeIdentifier(NodeIdentifierWithPredicates.of( listInChoice, listInChoiceKey, keyVal)); mapEntryBuilder.addChild(ImmutableNodes.leafNode(listInChoiceKey, @@ -559,7 +552,7 @@ public class DataTreeCandidateValidatorTest { return mapEntryBuilder.build(); } - private static void delete() { + private static void delete() throws DataValidationFailedException { final YangInstanceIdentifier contributorPath = YangInstanceIdentifier .of(odlContributor); @@ -568,8 +561,7 @@ public class DataTreeCandidateValidatorTest { delete.delete(contributorPath); delete.ready(); - final DataTreeCandidate deleteContributorsCanditate = inMemoryDataTree - .prepare(delete); + final DataTreeCandidate deleteContributorsCanditate = inMemoryDataTree.prepare(delete); LOG.debug("*************************"); LOG.debug("Before delete: "); @@ -601,9 +593,9 @@ public class DataTreeCandidateValidatorTest { final ContainerSchemaNode contributorContSchemaNode) { final ListSchemaNode contributorListSchemaNode = (ListSchemaNode) contributorContSchemaNode - .getDataChildByName(contributor); + .findDataChildByName(contributor).get(); - final DataContainerNodeAttrBuilder contributorContainerBldr = Builders + final DataContainerNodeBuilder contributorContainerBldr = Builders .containerBuilder(contributorContSchemaNode); final MapNode contributorMap = createContributorList(contributorListSchemaNode); @@ -672,14 +664,10 @@ public class DataTreeCandidateValidatorTest { final String odlProjectNameVal, final String odlProjectDescVal, final ListSchemaNode contributorListSchemaNode) { - final LeafNode loginLeaf = ImmutableNodes.leafNode(login, - loginVal); - final LeafNode contributorNameLeaf = ImmutableNodes.leafNode( - contributorName, contributorNameVal); - final LeafNode odlProjectNameLeafRef = ImmutableNodes.leafNode( - odlProjectName, odlProjectNameVal); - final LeafNode odlProjectDescLeafRef = ImmutableNodes.leafNode( - odlProjectDesc, odlProjectDescVal); + final LeafNode loginLeaf = ImmutableNodes.leafNode(login, loginVal); + final LeafNode contributorNameLeaf = ImmutableNodes.leafNode(contributorName, contributorNameVal); + final LeafNode odlProjectNameLeafRef = ImmutableNodes.leafNode(odlProjectName, odlProjectNameVal); + final LeafNode odlProjectDescLeafRef = ImmutableNodes.leafNode(odlProjectDesc, odlProjectDescVal); return Builders.mapEntryBuilder(contributorListSchemaNode) .addChild(loginLeaf) @@ -692,10 +680,9 @@ public class DataTreeCandidateValidatorTest { private static ContainerNode createOdlContainer( final ContainerSchemaNode container) { - final ListSchemaNode projListSchemaNode = (ListSchemaNode) container - .getDataChildByName(project); + final ListSchemaNode projListSchemaNode = (ListSchemaNode) container.findDataChildByName(project).get(); - final DataContainerNodeAttrBuilder odlProjectContainerBldr = Builders + final DataContainerNodeBuilder odlProjectContainerBldr = Builders .containerBuilder(container); final MapNode projectMap = createProjectList(projListSchemaNode); @@ -745,7 +732,7 @@ public class DataTreeCandidateValidatorTest { final LeafNode ownerLeafRef = ImmutableNodes.leafNode(owner, ownerVal); - final DataContainerNodeAttrBuilder projMapEntryBldr = Builders + final DataContainerNodeBuilder projMapEntryBldr = Builders .mapEntryBuilder(projListSchemaNode); projMapEntryBldr.addChild(nameLeaf); @@ -761,9 +748,9 @@ public class DataTreeCandidateValidatorTest { final ContainerSchemaNode contributorContSchemaNode) { final ListSchemaNode contributorListSchemaNode = (ListSchemaNode) contributorContSchemaNode - .getDataChildByName(contributor); + .findDataChildByName(contributor).get(); - final DataContainerNodeAttrBuilder contributorContainerBldr = Builders + final DataContainerNodeBuilder contributorContainerBldr = Builders .containerBuilder(contributorContSchemaNode); final MapNode contributorMap = createBasicContributorList(contributorListSchemaNode);