Code Review / yangtools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Adjust test suite parser update to conform with API changes
[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / YangParserWithContextTest.java
diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java
index 74f43e19abe88bf128bb256c8a5d2dce3fb5b649..9fe0a6e986e64d212cb6adad9b1d38cfcbb0b5af 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java
@@ -31,6 +31,7 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DeviateKind;
 import org.opendaylight.yangtools.yang.model.api.Deviation;
+import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
@@ -44,9 +45,9 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
 
 public class YangParserWithContextTest {
     private static final URI T1_NS = URI.create("urn:simple.demo.test1");
@@ -69,17 +70,12 @@ public class YangParserWithContextTest {
             sourceForResource("/ietf/network-topology@2013-10-21.yang") };
 
     @Test
-    public void testTypeFromContext() throws Exception {
-
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-04-04.yang");
-        final StatementStreamSource test1 = sourceForResource("/context-test/test1.yang");
-
-        reactor.addSources(IETF);
-        reactor.addSources(types, test1);
-
-        final SchemaContext context = reactor.buildEffective();
+    public void testTypeFromContext() throws ReactorException {
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
+                .addSources(IETF)
+                .addSource(sourceForResource("/types/custom-types-test@2012-04-04.yang"))
+                .addSource(sourceForResource("/context-test/test1.yang"))
+                .buildEffective();
 
         final Module module = context.findModule("test1", Revision.of("2013-06-18")).get();
         final LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(QName.create(module.getQNameModule(),
@@ -108,12 +104,10 @@ public class YangParserWithContextTest {
     }
 
     @Test
-    public void testUsesFromContext() throws Exception {
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        final StatementStreamSource test2 = sourceForResource("/context-test/test2.yang");
-        reactor.addSources(BAZ, FOO, BAR, SUBFOO, test2);
-        final SchemaContext context = reactor.buildEffective();
+    public void testUsesFromContext() throws ReactorException {
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
+                .addSources(BAZ, FOO, BAR, SUBFOO, sourceForResource("/context-test/test2.yang"))
+                .buildEffective();
 
         final Module testModule = context.findModule("test2", Revision.of("2013-06-18")).get();
         final Module contextModule = context.findModules(URI.create("urn:opendaylight.baz")).iterator().next();
@@ -214,13 +208,10 @@ public class YangParserWithContextTest {
     }
 
     @Test
-    public void testUsesRefineFromContext() throws Exception {
-
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        final StatementStreamSource test2 = sourceForResource("/context-test/test2.yang");
-        reactor.addSources(BAZ, FOO, BAR, SUBFOO, test2);
-        final SchemaContext context = reactor.buildEffective();
+    public void testUsesRefineFromContext() throws ReactorException {
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
+                .addSources(BAZ, FOO, BAR, SUBFOO, sourceForResource("/context-test/test2.yang"))
+                .buildEffective();
 
         final Module module = context.findModule("test2", Revision.of("2013-06-18")).get();
         final ContainerSchemaNode peer = (ContainerSchemaNode) module.getDataChildByName(QName.create(
@@ -263,14 +254,14 @@ public class YangParserWithContextTest {
         assertEquals(Optional.of("address reference added by refine"), refineLeaf.getReference());
         assertFalse(refineLeaf.isConfiguration());
         assertTrue(refineLeaf.isMandatory());
-        final Collection<MustDefinition> leafMustConstraints = refineLeaf.getConstraints().getMustConstraints();
+        final Collection<MustDefinition> leafMustConstraints = refineLeaf.getMustConstraints();
         assertEquals(1, leafMustConstraints.size());
         final MustDefinition leafMust = leafMustConstraints.iterator().next();
         assertEquals("ifType != 'ethernet' or (ifType = 'ethernet' and ifMTU = 1500)", leafMust.toString());
 
         // container port
         assertNotNull(refineContainer);
-        final Collection<MustDefinition> mustConstraints = refineContainer.getConstraints().getMustConstraints();
+        final Collection<MustDefinition> mustConstraints = refineContainer.getMustConstraints();
         assertTrue(mustConstraints.isEmpty());
         assertEquals(Optional.of("description of port defined by refine"), refineContainer.getDescription());
         assertEquals(Optional.of("port reference added by refine"), refineContainer.getReference());
@@ -282,21 +273,18 @@ public class YangParserWithContextTest {
         assertEquals(Optional.of("description of addresses defined by refine"), refineList.getDescription());
         assertEquals(Optional.of("addresses reference added by refine"), refineList.getReference());
         assertFalse(refineList.isConfiguration());
-        assertEquals(2, (int) refineList.getConstraints().getMinElements());
-        assertEquals(12, (int) refineList.getConstraints().getMaxElements());
+        final ElementCountConstraint constraint = refineList.getElementCountConstraint().get();
+        assertEquals(2, constraint.getMinElements().intValue());
+        assertEquals(12, constraint.getMaxElements().intValue());
     }
 
     @Test
-    public void testIdentity() throws Exception {
-
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-04-04.yang");
-        final StatementStreamSource test3 = sourceForResource("/context-test/test3.yang");
-
-        reactor.addSources(IETF);
-        reactor.addSources(types, test3);
-        final SchemaContext context = reactor.buildEffective();
+    public void testIdentity() throws ReactorException {
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
+                .addSources(IETF)
+                .addSource(sourceForResource("/types/custom-types-test@2012-04-04.yang"))
+                .addSource(sourceForResource("/context-test/test3.yang"))
+                .buildEffective();
 
         final Module module = context.findModule("test3", Revision.of("2013-06-18")).get();
         final Set<IdentitySchemaNode> identities = module.getIdentities();
@@ -316,17 +304,12 @@ public class YangParserWithContextTest {
     }
 
     @Test
-    public void testUnknownNodes() throws Exception {
-
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-04-04.yang");
-        final StatementStreamSource test3 = sourceForResource("/context-test/test3.yang");
-
-        reactor.addSources(IETF);
-        reactor.addSources(types, test3);
-
-        final SchemaContext context = reactor.buildEffective();
+    public void testUnknownNodes() throws ReactorException {
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
+                .addSources(IETF)
+                .addSource(sourceForResource("/types/custom-types-test@2012-04-04.yang"))
+                .addSource(sourceForResource("/context-test/test3.yang"))
+                .buildEffective();
 
         final Module module = context.findModule("test3", Revision.of("2013-06-18")).get();
         final ContainerSchemaNode network = (ContainerSchemaNode) module.getDataChildByName(QName.create(
@@ -344,7 +327,7 @@ public class YangParserWithContextTest {
     }
 
     @Test
-    public void testAugment() throws Exception {
+    public void testAugment() throws ReactorException {
         final StatementStreamSource resource = sourceForResource("/context-augment-test/test4.yang");
         final StatementStreamSource test1 = sourceForResource("/context-augment-test/test1.yang");
         final StatementStreamSource test2 = sourceForResource("/context-augment-test/test2.yang");
@@ -380,15 +363,11 @@ public class YangParserWithContextTest {
     }
 
     @Test
-    public void testDeviation() throws Exception {
-
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        final StatementStreamSource bar = sourceForResource("/model/bar.yang");
-        final StatementStreamSource deviationTest = sourceForResource("/context-test/deviation-test.yang");
-
-        reactor.addSources(bar, deviationTest);
-        final SchemaContext context = reactor.buildEffective();
+    public void testDeviation() throws ReactorException {
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
+                .addSource(sourceForResource("/model/bar.yang"))
+                .addSource(sourceForResource("/context-test/deviation-test.yang"))
+                .buildEffective();
 
         final Module testModule = context.findModule("deviation-test", Revision.of("2013-02-27")).get();
         final Set<Deviation> deviations = testModule.getDeviations();
OpenDaylight YANG Tools