Adjust test suite parser update to conform with API changes

This is the next step to parser split-up: make sure the unit test
suite refers to the minimum parser it needs to perform its function.

Change-Id: I8ddb143706debfe9f2ac2fc665ec982c1c4e3039
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java
index 6aded3cda95938540bc1abefba415c3a6f559cec..9b2e7a912be241af53e4a5ce2407d02e39127ab5 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
@@ -32,7 +32,7 @@ public class ElementCountConstraintsTest {
     @Test
     public void testElementCountConstraints() throws ParseException, ReactorException, URISyntaxException, IOException,
             YangSyntaxErrorException {
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(YangStatementStreamSource.create(
                     YangTextSchemaSource.forResource("/constraint-definitions-test/foo.yang")))
                 .buildEffective();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java
index ee8fe24a1d6ed4b5345bbda1ef5b0c00f7d8ee86..05ec86613e0dde903637d4c921486ec2070958bd 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.meta.SomeModifiersUnresolvedException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -84,7 +84,7 @@ public class Bug6874Test {
 
     @Test
     public void descriptionAndReferenceTest11() throws ReactorException {
-        DefaultReactors.defaultReactor().newBuild()
+        RFC7950Reactors.defaultReactor().newBuild()
             .addSources(ROOT_MODULE, CHILD_MODULE, CHILD_MODULE_1, IMPORTED_MODULE)
             .build().getRootStatements().forEach(declaredStmt -> {
                 if (declaredStmt instanceof ModuleStatement) {

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java
index 60995aefc6ea37d460588c83c2a4e98936c7bf42..6a8444584453756ea504abf284fb65d5ae4ff438 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java
@@ -15,7 +15,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -43,7 +43,7 @@ public class AugmentArgumentParsingTest {
 
     @Test
     public void validAugAbsTest() throws ReactorException {
-        final EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        final EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IMPORTED, VALID_ARGS)
                 .build();
         assertNotNull(result);
@@ -51,7 +51,7 @@ public class AugmentArgumentParsingTest {
 
     @Test
     public void invalidAugRel1Test() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSources(INVALID_REL1);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(INVALID_REL1);
 
         try {
             reactor.build();
@@ -63,7 +63,7 @@ public class AugmentArgumentParsingTest {
 
     @Test
     public void invalidAugRel2Test() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSources(INVALID_REL2);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(INVALID_REL2);
 
         try {
             reactor.build();
@@ -75,7 +75,7 @@ public class AugmentArgumentParsingTest {
 
     @Test
     public void invalidAugAbs() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSources(INVALID_ABS);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(INVALID_ABS);
 
         try {
             reactor.build();
@@ -87,7 +87,7 @@ public class AugmentArgumentParsingTest {
 
     @Test
     public void invalidAugAbsPrefixedNoImp() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSources(INVALID_ABS_PREFIXED_NO_IMP);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(INVALID_ABS_PREFIXED_NO_IMP);
 
         try {
             reactor.build();
@@ -100,14 +100,14 @@ public class AugmentArgumentParsingTest {
     @Test(expected = IllegalArgumentException.class)
     @Ignore
     public void invalidAugEmptyTest() throws ReactorException {
-        DefaultReactors.defaultReactor().newBuild().addSources(INVALID_EMPTY).build();
+        RFC7950Reactors.defaultReactor().newBuild().addSources(INVALID_EMPTY).build();
         fail("reactor.process should fail due to empty path");
     }
 
     @Test(expected = IllegalArgumentException.class)
     @Ignore
     public void invalidAugXPathTest() throws ReactorException {
-        DefaultReactors.defaultReactor().newBuild().addSources(INVALID_XPATH).build();
+        RFC7950Reactors.defaultReactor().newBuild().addSources(INVALID_XPATH).build();
         fail("reactor.process should fail due to invalid XPath");
     }
 

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java
index a75a500479c4603518b28ada6c6c69901338cbb5..92eaad690d9a42464b6ac78fad733e01ba55a153 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java
@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 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.parser.impl.DefaultReactors;
+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.meta.SomeModifiersUnresolvedException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -86,7 +86,7 @@ public class AugmentProcessTest {
 
     @Test
     public void multipleAugmentsAndMultipleModulesTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(MULTIPLE_AUGMENT_ROOT, MULTIPLE_AUGMENT_IMPORTED, MULTIPLE_AUGMENT_SUBMODULE)
                 .buildEffective();
         assertNotNull(result);
@@ -94,7 +94,7 @@ public class AugmentProcessTest {
 
     @Test
     public void multipleAugmentTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(MULTIPLE_AUGMENT)
                 .buildEffective();
         assertNotNull(result);
@@ -102,7 +102,7 @@ public class AugmentProcessTest {
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void multipleAugmentIncorrectPathTest() throws  ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(MULTIPLE_AUGMENT_INCORRECT)
                 .buildEffective();
         assertNull(result);
@@ -110,7 +110,7 @@ public class AugmentProcessTest {
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void multipleAugmentIncorrectPathAndGrpTest() throws  ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(MULTIPLE_AUGMENT_INCORRECT2)
                 .buildEffective();
         assertNull(result);
@@ -118,7 +118,7 @@ public class AugmentProcessTest {
 
     @Test
     public void readAndParseYangFileTest() throws ReactorException {
-        final SchemaContext root = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext root = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(AUGMENTED, ROOT)
                 .buildEffective();
         assertNotNull(root);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java
index 9625715697d3fe6eba37c36f34b15f928b4c79e1..12f379173d3e87bd65c8f566523645c1c7452bab 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -26,7 +26,7 @@ public class AugmentSimplestTest {
 
     @Test
     public void readAndParseYangFileTest() throws SourceException, ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(AUGMENTED, ROOT)
                 .build();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java
index 4ff134ce8402d216c099e44340c1dd36785de156..a4db7f952dff5ded72d54a63a7a19efda29fe6a8 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java
@@ -23,14 +23,21 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
+import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
 import org.opendaylight.yangtools.yang.parser.odlext.stmt.AnyxmlSchemaLocationEffectiveStatementImpl;
+import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
 
 public class Bug3874ExtensionTest {
 
     @Test
     public void test() throws Exception {
-        SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug3874");
+        SchemaContext context = DefaultReactors.defaultReactor().newBuild()
+                .addSource(YangStatementStreamSource.create(YangTextSchemaSource.forResource("/bugs/bug3874/foo.yang")))
+                .addSource(YangStatementStreamSource.create(
+                    YangTextSchemaSource.forResource("/bugs/bug3874/yang-ext.yang")))
+                .buildEffective();
 
         QNameModule foo = QNameModule.create(URI.create("foo"));
         QName myContainer2QName = QName.create(foo, "my-container-2");

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java
index 7ec87a6251c7953f03085a72edcd6013ac342d38..8d63dbc9457a79914670cb67f834409028a1834d 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java
@@ -12,7 +12,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -24,7 +24,7 @@ public class Bug6150Test {
 
     @Test
     public void effectiveAugmentFirstTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(TARGET, AUGMENT_FIRST)
                 .buildEffective();
         assertNotNull(result);
@@ -32,7 +32,7 @@ public class Bug6150Test {
 
     @Test
     public void effectiveAugmentSecondTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(TARGET, AUGMENT_SECOND)
                 .buildEffective();
         assertNotNull(result);
@@ -40,7 +40,7 @@ public class Bug6150Test {
 
     @Test
     public void effectiveAugmentBothTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(TARGET, AUGMENT_FIRST, AUGMENT_SECOND)
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java
index 02eadfb6ca0b5309dee55193a288522e07c032af..dbb6ad5d3719efd149867ef1b60a5f6d20af4159 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java
@@ -18,7 +18,7 @@ import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException;
 
 public class Bug7480Test {
@@ -61,7 +61,7 @@ public class Bug7480Test {
     public void testHandlingOfMainSourceConflictingWithLibSource() throws Exception {
         // parent module as main source and as lib source at the same time
         // parser should remove it from the required lib sources and thus avoid module namespace collision
-        final SchemaContext schemaContext =  DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext =  RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(StmtTestUtils.sourceForResource(
                         "/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang"))
                 .addLibSources(
@@ -77,7 +77,7 @@ public class Bug7480Test {
     public void testHandlingOfMainSourceConflictingWithLibSource2() throws Exception {
         // submodule as main source and as lib source at the same time
         // parser should remove it from the required lib sources and thus avoid submodule name collision
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(StmtTestUtils.sourceForResource(
                         "/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang"))
                 .addLibSources(

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java
index a3ce81bbc0b6394b5d0232c5d20612f4f5f03df6..a36bbe206ddc763da3dd4dfb04858ffdd5ae96bc 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -75,7 +75,7 @@ public class Bug8307Test {
         final Map<QNameModule, Set<QNameModule>> modulesWithSupportedDeviations = ImmutableMap.of(
                 foo, ImmutableSet.of(bar, baz), bar, ImmutableSet.of(baz));
 
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO_MODULE, BAR_MODULE, BAZ_MODULE, FOOBAR_MODULE)
                 .setModulesWithSupportedDeviations(modulesWithSupportedDeviations)
                 .buildEffective();
@@ -90,7 +90,7 @@ public class Bug8307Test {
 
     @Test
     public void testDeviationsSupportedInAllModules() throws Exception {
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO_MODULE, BAR_MODULE, BAZ_MODULE, FOOBAR_MODULE)
                 .buildEffective();
         assertNotNull(schemaContext);
@@ -104,7 +104,7 @@ public class Bug8307Test {
 
     @Test
     public void testDeviationsSupportedInNoModule() throws Exception {
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO_MODULE, BAR_MODULE, BAZ_MODULE, FOOBAR_MODULE)
                 .setModulesWithSupportedDeviations(ImmutableMap.of())
                 .buildEffective();
@@ -119,7 +119,7 @@ public class Bug8307Test {
 
     @Test
     public void shouldFailOnAttemptToDeviateTheSameModule() {
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSources(FOO_INVALID_MODULE);
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(FOO_INVALID_MODULE);
 
         try {
             reactor.buildEffective();
@@ -134,7 +134,7 @@ public class Bug8307Test {
 
     @Test
     public void shouldFailOnAttemptToDeviateTheSameModule2() {
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(BAR_INVALID_MODULE, BAZ_INVALID_MODULE);
 
         try {

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java
index e078df078c601a4ee54a1c09c810bc3127647128..46734d57864c15d2f5ea7b35ace6c98386388ec6 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java
@@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -31,7 +31,7 @@ public class ChoiceStmtTest {
 
     @Test
     public void choiceAndCaseTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(CHOICE_MODULE, IMPORTED_MODULE1, IMPORTED_MODULE2, INCLUDED_MODULE)
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java
index 8faca7d8df1de1b41d60b0fdf0584a2b022d1ce6..283b0156e8e975ac0ad96b8a2415772ff75d319f 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java
@@ -13,7 +13,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
-import java.text.ParseException;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -25,7 +24,7 @@ import org.opendaylight.yangtools.yang.model.api.Deviation;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -37,8 +36,8 @@ public class DeviationStmtTest {
     private static final StatementStreamSource BAR_IMP_MODULE = sourceForResource("/deviation-stmt-test/bar-imp.yang");
 
     @Test
-    public void testDeviationAndDeviate() throws ReactorException, ParseException {
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+    public void testDeviationAndDeviate() throws ReactorException {
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO_MODULE, FOO_IMP_MODULE, BAR_MODULE, BAR_IMP_MODULE)
                 .buildEffective();
         assertNotNull(schemaContext);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java
index 750c316644b308e079cf79c62c37b7d49ebb725c..a0b208b36771f0f78364fa21f6bd9a565f7fca60 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java
@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -41,7 +41,7 @@ public class EffectiveBuildTest {
 
     @Test
     public void effectiveBuildTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild().addSources(SIMPLE_MODULE)
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild().addSources(SIMPLE_MODULE)
                 .buildEffective();
 
         assertNotNull(result);
@@ -92,7 +92,7 @@ public class EffectiveBuildTest {
 
     @Test
     public void extensionsTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild().addSource(YANG_EXT).buildEffective();
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild().addSource(YANG_EXT).buildEffective();
         assertNotNull(result);
 
         Set<GroupingDefinition> groupings = result.getGroupings();
@@ -112,7 +112,7 @@ public class EffectiveBuildTest {
 
     @Test
     public void mockTest() throws ReactorException, FileNotFoundException, URISyntaxException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild().addSource(YANG_EXT).buildEffective();
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild().addSource(YANG_EXT).buildEffective();
         assertNotNull(result);
     }
 }

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java
index 4386222cc33e68ac686fe24f82e312e8ffa63715..bf438554f667932351921a18301b08f22df44e6f 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.meta.SomeModifiersUnresolvedException;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
@@ -39,7 +39,7 @@ public class EffectiveIdentityTest {
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void cyclicefineTest() throws SourceException, ReactorException, URISyntaxException {
 
-        CrossSourceStatementReactor.BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        CrossSourceStatementReactor.BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(CYCLIC_IDENTITY_TEST);
         try {
             reactor.buildEffective();
@@ -52,7 +52,7 @@ public class EffectiveIdentityTest {
     @Test
     public void identityTest() throws SourceException, ReactorException,
             URISyntaxException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IDENTITY_TEST)
                 .buildEffective();
 

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
index e53fc486ec166308f97c41bfefa47b74f9e46bee..1bb594e34a78300d4cf9275099da5764929b6b8d 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
@@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -61,7 +61,7 @@ public class EffectiveModuleTest {
 
     @Test
     public void effectiveBuildTest() throws SourceException, ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_MODULE, IMPORTED_MODULE, SUBMODULE)
                 .buildEffective();
 

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
index 845c11b6752c6cf89f3ffcefdd3d9548c4c00221..47d876a4fd8ee455bb52d62ab3960cf4d57c3116 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -44,7 +44,7 @@ public class EffectiveModulesAndSubmodulesTest {
 
     @Test
     public void modulesAndSubmodulesSimpleReferencesTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_MODULE, IMPORTED_MODULE, SUBMODULE_1, SUBMODULE_2, SUBMODULE_TO_SUBMODULE_1)
                 .buildEffective();
 

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java
index 2c456617a7e8066754cac9d1b11793b687fcfa77..70766bf24b3e2388b3a39bb9e1a77b4946cbdd4f 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java
@@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.util.SimpleSchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveSchemaContext;
@@ -46,7 +46,7 @@ public class EffectiveSchemaContextTest {
     @Test
     public void testEffectiveSchemaContext() throws ReactorException, ParseException, URISyntaxException, IOException,
             YangSyntaxErrorException {
-        final EffectiveSchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final EffectiveSchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(YangStatementStreamSource.create(YangTextSchemaSource.forResource(
                         "/effective-schema-context-test/foo.yang")))
                 .addSource(YangStatementStreamSource.create(YangTextSchemaSource.forResource(

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java
index a506fb48e1def752cd35d017bd5cf13b3f5799d3..0cdbc4b0e295d6253552efc2085f220d0efc8133 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java
@@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type.BitsSpecificationEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type.Decimal64SpecificationEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type.EnumSpecificationEffectiveStatement;
@@ -59,7 +59,7 @@ public class EffectiveStatementTypeTest {
 
     @BeforeClass
     public static void setup() throws ReactorException {
-        effectiveSchemaContext = DefaultReactors.defaultReactor().newBuild()
+        effectiveSchemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/type-tests/types.yang"))
                 .buildEffective();
         types = effectiveSchemaContext.findModules("types").iterator().next();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java
index 1405466408c2e52ccb01df123443690cd9d8dd2b..d611e0d8b509b370249c22992d5573a875b8f0b9 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java
@@ -28,14 +28,14 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class EffectiveUsesRefineAndConstraintsTest {
 
     @Test
     public void refineTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/stmt-test/uses/refine-test.yang"))
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java
index 6eaa3a78af0192e9eb8dbc4b09e97e922fa65d2e..10d45274344ccbc6c5dbb82a588b517e1f174b5c 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java
@@ -21,13 +21,13 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class ExtensionStmtTest {
     @Test
     public void testExtensionDefinition() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/model/bar.yang"))
                 .buildEffective();
         assertNotNull(result);
@@ -46,7 +46,7 @@ public class ExtensionStmtTest {
 
     @Test
     public void testExtensionUsage() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/semantic-statement-parser/ext-typedef.yang"))
                 .addSource(sourceForResource("/semantic-statement-parser/ext-use.yang"))
                 .buildEffective();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java
index f53f0c929c7d941dc31c4535eb712202628b62b7..fa34d5650b0740cd695e8e2b020488805f06e376 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java
@@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -46,7 +46,7 @@ public class GroupingAndUsesStmtTest {
 
     @Test
     public void groupingTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(MODULE, GROUPING_MODULE)
                 .buildEffective();
         assertNotNull(result);
@@ -92,7 +92,7 @@ public class GroupingAndUsesStmtTest {
 
     @Test
     public void usesAndRefinesTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(MODULE, SUBMODULE, GROUPING_MODULE, USES_MODULE)
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java
index dacebb5c39ca4d8320b3e9e3021d7ea1241096db..a58ece2738cd0294aded3f9298ff4d43399669f5 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.meta.SomeModifiersUnresolvedException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -45,17 +45,17 @@ public class IdentityStmtTest {
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void selfReferencingIdentityTest() throws ReactorException {
-        DefaultReactors.defaultReactor().newBuild().addSource(ILLEGAL_IDENTITY_MODULE).buildEffective();
+        RFC7950Reactors.defaultReactor().newBuild().addSource(ILLEGAL_IDENTITY_MODULE).buildEffective();
     }
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void selfReferencingIdentityWithPrefixTest() throws ReactorException {
-        DefaultReactors.defaultReactor().newBuild().addSource(ILLEGAL_IDENTITY_MODULE2).buildEffective();
+        RFC7950Reactors.defaultReactor().newBuild().addSource(ILLEGAL_IDENTITY_MODULE2).buildEffective();
     }
 
     @Test
     public void importedIdentityTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(LEGAL_IDENTITY_MODULE, LEGAL_IDENTITY_MODULE2)
                 .buildEffective();
         assertNotNull(result);
@@ -63,7 +63,7 @@ public class IdentityStmtTest {
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void selfReferencingIdentityThroughChaining() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(ILLEGAL_IDENTITY_MODULE3)
                 .buildEffective();
         assertNotNull(result);
@@ -71,7 +71,7 @@ public class IdentityStmtTest {
 
     @Test
     public void chainedIdentityTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(LEGAL_IDENTITY_MODULE3)
                 .buildEffective();
         assertNotNull(result);
@@ -102,7 +102,7 @@ public class IdentityStmtTest {
 
     @Test
     public void duplicateIdentityTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(DUPLICATE_IDENTITY_MODULE)
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java
index f7f2e9d29d6ed182c77788ba0c06a27d8f7dfbad..4115485ca2b1f6aa33d25e3dcb31633a6556b900 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java
@@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -39,7 +39,7 @@ public class IfFeatureResolutionTest {
                 QName.create("foo-namespace", "test-feature-3"),
                 QName.create("bar-namespace", "imp-feature"));
 
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO_MODULE, BAR_MODULE)
                 .setSupportedFeatures(supportedFeatures)
                 .buildEffective();
@@ -143,7 +143,7 @@ public class IfFeatureResolutionTest {
 
     @Test
     public void testAllFeaturesSupported() throws ReactorException {
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO_MODULE, BAR_MODULE)
                 .buildEffective();
         assertNotNull(schemaContext);
@@ -269,7 +269,7 @@ public class IfFeatureResolutionTest {
 
     @Test
     public void testNoFeaturesSupported() throws ReactorException {
-        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext schemaContext = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO_MODULE, BAR_MODULE)
                 .setSupportedFeatures(ImmutableSet.of())
                 .buildEffective();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java
index 5a925d3d306fca30a3a4bbe63250e6916a2d29cb..fabd392ffe03af74e2f2ea1ea16d9e105a431cdf 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java
@@ -16,7 +16,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException;
@@ -46,7 +46,7 @@ public class ImportResolutionBasicTest {
 
     @Test
     public void inImportOrderTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_WITHOUT_IMPORT, IMPORT_ROOT, IMPORT_DERIVED)
                 .build();
         assertNotNull(result);
@@ -54,7 +54,7 @@ public class ImportResolutionBasicTest {
 
     @Test
     public void inInverseOfImportOrderTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IMPORT_DERIVED, IMPORT_ROOT, ROOT_WITHOUT_IMPORT)
                 .build();
         assertNotNull(result);
@@ -62,7 +62,7 @@ public class ImportResolutionBasicTest {
 
     @Test
     public void missingImportedSourceTest() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IMPORT_DERIVED, ROOT_WITHOUT_IMPORT);
         try {
             reactor.build();
@@ -76,8 +76,7 @@ public class ImportResolutionBasicTest {
 
     @Test
     public void circularImportsTest() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
-                .addSources(CYCLE_YIN, CYCLE_YANG);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(CYCLE_YIN, CYCLE_YANG);
         try {
             reactor.build();
             fail("reactor.process should fail due to circular import");
@@ -89,7 +88,7 @@ public class ImportResolutionBasicTest {
 
     @Test
     public void selfImportTest() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IMPORT_SELF, IMPORT_ROOT, ROOT_WITHOUT_IMPORT);
         try {
             reactor.build();
@@ -102,7 +101,7 @@ public class ImportResolutionBasicTest {
 
     @Test
     public void bug2649Test() throws ReactorException {
-        SchemaContext buildEffective = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext buildEffective = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(FOO, IMPORT)
                 .buildEffective();
         assertNotNull(buildEffective);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java
index ab4de65ad015a8a8164c276f206d47b1ca7b553e..3441c2729c78303a2482fb1ae67da4822015af63 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.meta.SomeModifiersUnresolvedException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -43,7 +43,7 @@ public class ImportRevisionsTest {
 
     @Test
     public void equalRevisionDatesTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_WITH_EQUAL_DATE, IMPORTED_WITH_EQUAL_DATE)
                 .build();
         assertNotNull(result);
@@ -51,14 +51,14 @@ public class ImportRevisionsTest {
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void unequalRevisionDatesTest() throws ReactorException {
-        DefaultReactors.defaultReactor().newBuild()
+        RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_WITH_UNEQUAL_DATE, IMPORTED_WITH_UNEQUAL_DATE)
                 .build();
     }
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void revisionDatesInRootOnlyTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_WITH_DATE, IMPORTED_WITHOUT_DATE)
                 .build();
         assertNotNull(result);
@@ -66,7 +66,7 @@ public class ImportRevisionsTest {
 
     @Test
     public void revisionDatesInImportedOnlyTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_WITHOUT_DATE, IMPORTED_WITH_DATE)
                 .build();
         assertNotNull(result);
@@ -74,7 +74,7 @@ public class ImportRevisionsTest {
 
     @Test
     public void noRevisionInRootAndImportedTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT_WITH_NO_DATE, IMPORTED_WITH_NO_DATE)
                 .build();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java
index 6b8ca46038398007a9b6144cf99504e5a89d7991..df6e363f5da53db2819a4b64d88879011aad0bf6 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java
@@ -16,7 +16,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour
 
 import java.util.logging.Logger;
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException;
@@ -45,7 +45,7 @@ public class IncludeResolutionTest {
 
     @Test
     public void includeTest() throws SourceException, ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(ROOT, SUBMODULE1, SUBMODULE2)
                 .build();
         assertNotNull(result);
@@ -53,7 +53,7 @@ public class IncludeResolutionTest {
 
     @Test
     public void missingIncludedSourceTest() throws SourceException {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSource(ERROR_MODULE);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSource(ERROR_MODULE);
         try {
             reactor.build();
             fail("reactor.process should fail due to missing included source");
@@ -67,7 +67,7 @@ public class IncludeResolutionTest {
 
     @Test
     public void missingIncludedSourceTest2() throws SourceException {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSource(ERROR_SUBMODULE);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSource(ERROR_SUBMODULE);
         try {
             reactor.build();
             fail("reactor.process should fail due to missing included source");
@@ -81,7 +81,7 @@ public class IncludeResolutionTest {
 
     @Test
     public void missingIncludedSourceTest3() throws SourceException, ReactorException {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSource(MISSING_PARENT_MODULE);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSource(MISSING_PARENT_MODULE);
         try {
             reactor.build();
             fail("reactor.process should fail due to missing belongsTo source");

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java
index 9a482200e952951c16297abc75efd7b34837696f..7c4e6b4ce123c747796275d0261a3b940cd8449f 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.fail;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException;
@@ -38,7 +38,7 @@ public class IncludeRevisionsTest {
 
     @Test
     public void revsEqualTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(EQUAL_REV, EQUAL_ROOT)
                 .build();
         assertNotNull(result);
@@ -46,7 +46,7 @@ public class IncludeRevisionsTest {
 
     @Test
     public void revsUnequalTest() throws ReactorException {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSources(UNEQUAL_REV, UNEQUAL_ROOT);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(UNEQUAL_REV, UNEQUAL_ROOT);
         try {
             reactor.build();
             fail("reactor.process should fail due to unequal revisions in include and submodule");
@@ -58,7 +58,7 @@ public class IncludeRevisionsTest {
 
     @Test
     public void revIncludeOnly() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(SUBMOD_ONLY_REV, SUBMOD_ONLY_ROOT)
                 .build();
         assertNotNull(result);
@@ -66,7 +66,7 @@ public class IncludeRevisionsTest {
 
     @Test
     public void revInModuleOnly() throws ReactorException {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSources(MOD_ONLY_REV, MOD_ONLY_ROOT);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(MOD_ONLY_REV, MOD_ONLY_ROOT);
         try {
             reactor.build();
             fail("reactor.process should fail due to missing revision in included submodule");
@@ -78,7 +78,7 @@ public class IncludeRevisionsTest {
 
     @Test
     public void revNowhereTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(NOWHERE_REV, NOWHERE_ROOT)
                 .build();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java
index 553fb8ce3bf89b6374f8bf4f10e972658024ae77..9065e0096f1ed2b556eb8151a2780af967565404 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class IncludedStmtsTest {
@@ -34,7 +34,7 @@ public class IncludedStmtsTest {
 
     @BeforeClass
     public static void setup() throws ReactorException {
-        result = DefaultReactors.defaultReactor().newBuild()
+        result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/included-statements-test/root-module.yang"))
                 .addSource(sourceForResource("/included-statements-test/child-module.yang"))
                 .buildEffective();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java
index 609880ab153604661db927924a4139f0e72d049e..f8c5f51561f6e8ad90531a854f633317d09cd11c 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.fail;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
@@ -30,7 +30,7 @@ public class KeyTest {
 
     @Test
     public void keySimpleTest() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(KEY_SIMPLE_AND_COMP)
                 .build();
         assertNotNull(result);
@@ -38,7 +38,7 @@ public class KeyTest {
 
     @Test
     public void keyCompositeInvalid() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild().addSource(KEY_COMP_DUPLICATE);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSource(KEY_COMP_DUPLICATE);
         try {
             reactor.build();
             fail("reactor.process should fail due to duplicate name in key");

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
index fc02066a5c23140256b40f253eaa8d05a31cdd4b..7899ffc83aad787cae9cbac29c2cf2502eae053c 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction;
 
@@ -22,7 +22,7 @@ public class ListKeysTest {
 
     @Test
     public void correctListKeysTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/list-keys-test/correct-list-keys-test.yang"))
                 .buildEffective();
         assertNotNull(result);
@@ -30,7 +30,7 @@ public class ListKeysTest {
 
     @Test
     public void incorrectListKeysTest1() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/list-keys-test/incorrect-list-keys-test.yang"));
         try {
             reactor.buildEffective();
@@ -42,7 +42,7 @@ public class ListKeysTest {
 
     @Test
     public void incorrectListKeysTest2() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/list-keys-test/incorrect-list-keys-test2.yang"));
         try {
             reactor.buildEffective();
@@ -54,7 +54,7 @@ public class ListKeysTest {
 
     @Test
     public void incorrectListKeysTest3() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/list-keys-test/incorrect-list-keys-test3.yang"));
         try {
             reactor.buildEffective();
@@ -66,7 +66,7 @@ public class ListKeysTest {
 
     @Test
     public void incorrectListKeysTest4()  {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/list-keys-test/incorrect-list-keys-test4.yang"));
         try {
             reactor.buildEffective();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java
index 9e703de28f66c1eeabd58e93f6a8bc241a980cd2..c8479e0b77d315d1bf78ee866244775d63fcb02f 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java
@@ -24,14 +24,14 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 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.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class ListTest {
 
     @Test
     public void listAndLeavesTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/list-test/list-test.yang"))
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
index bf431bf21896c7d648ae4eb1dedde2c446a504c1..55cb14136be8874dc9e51173d2ebd742f5e5ead5 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
@@ -31,7 +31,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -69,7 +69,7 @@ public class MoreRevisionsTest {
 
     @Test
     public void readAndParseYangFileTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild().addSource(REVFILE).buildEffective();
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild().addSource(REVFILE).buildEffective();
         assertNotNull(result);
         final Module moduleByName = result.getModules().iterator().next();
         assertEquals("2015-06-07", moduleByName.getQNameModule().getRevision().get().toString());
@@ -77,7 +77,7 @@ public class MoreRevisionsTest {
 
     @Test
     public void twoRevisionsTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(TED_20130712, TED_20131021, IETF_TYPES)
                 .buildEffective();
         assertNotNull(result);
@@ -85,7 +85,7 @@ public class MoreRevisionsTest {
 
     @Test
     public void twoRevisionsTest2() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(NETWORK_TOPOLOGY_20130712, NETWORK_TOPOLOGY_20131021, IETF_TYPES)
                 .buildEffective();
         assertNotNull(result);
@@ -97,7 +97,7 @@ public class MoreRevisionsTest {
 
     @Test
     public void moreRevisionsListKeyTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(TED_20130712, TED_20131021, ISIS_20130712, ISIS_20131021, L3_20130712, L3_20131021)
                 .addSources(IETF_TYPES,NETWORK_TOPOLOGY_20130712, NETWORK_TOPOLOGY_20131021)
                 .buildEffective();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java
index 5023e12db0cb6977372bb108a57cfe098065bab5..aef2927745a9fb38f610d66be8fc973b00bb773b 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java
@@ -25,13 +25,13 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class MustAndWhenStmtTest {
     @Test
     public void mustStmtTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/must-when-stmt-test/must-test.yang"))
                 .buildEffective();
         assertNotNull(result);
@@ -67,7 +67,7 @@ public class MustAndWhenStmtTest {
 
     @Test
     public void whenStmtTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/must-when-stmt-test/when-test.yang"))
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java
index c987e68b3b81d0cef168e54edb6950b679866fbd..5044394024562962f43ad8a9cf60b38a73d45ca2 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java
@@ -20,14 +20,14 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class NotificationStmtTest {
 
     @Test
     public void notificationTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(sourceForResource("/model/baz.yang"), sourceForResource("/model/bar.yang"))
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
index e52afedf11f674b4df180287909f0c863ed2ab51..cffdeabe5276ce1be2247bdf5c981efe15387f58 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
@@ -26,14 +26,14 @@ import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class RpcStmtTest {
 
     @Test
     public void rpcTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/model/baz.yang"))
                 .addSource(sourceForResource("/model/bar.yang"))
                 .addSource(sourceForResource("/rpc-stmt-test/foo.yang"))

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
index 9673f1ea7fcfc168247b558e2bbc738eed4b62b9..b9a2e0d220ff36a9675783bf784fdf300b5d547e 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
@@ -31,7 +31,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.repo.api.YinTextSchemaSource;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinTextToDomTransformer;
@@ -132,7 +132,7 @@ public class StmtTestUtils {
     public static SchemaContext parseYangSources(final StatementParserMode statementParserMode,
             final Set<QName> supportedFeatures, final Collection<? extends StatementStreamSource> sources)
             throws ReactorException {
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild(statementParserMode)
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild(statementParserMode)
                 .addSources(sources);
         if (supportedFeatures != null) {
             reactor.setSupportedFeatures(supportedFeatures);
@@ -224,7 +224,7 @@ public class StmtTestUtils {
     private static SchemaContext parseYangSources(final StatementStreamSource[] yangSources,
             final StatementStreamSource[] libSources, final Set<QName> supportedFeatures) throws ReactorException {
 
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(yangSources).addLibSources(libSources);
         if (supportedFeatures != null) {
             reactor.setSupportedFeatures(supportedFeatures);
@@ -251,7 +251,7 @@ public class StmtTestUtils {
 
     public static SchemaContext parseYinSources(final StatementParserMode statementParserMode,
             final StatementStreamSource... sources) throws ReactorException {
-        return DefaultReactors.defaultReactor().newBuild(statementParserMode).addSources(sources).buildEffective();
+        return RFC7950Reactors.defaultReactor().newBuild(statementParserMode).addSources(sources).buildEffective();
     }
 
     public static Module findImportedModule(final SchemaContext context, final Module rootModule,

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
index fd3057934793bc4094d0b4ccadce13f75d95b970..fceb6ed379625ab2b2d55f7992bf02edac37478c 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
@@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.repo.api.YinTextSchemaSource;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinTextToDomTransformer;
@@ -54,7 +54,7 @@ public final class TestUtils {
 
     public static SchemaContext loadModules(final URI resourceDirectory)
             throws ReactorException, IOException, YangSyntaxErrorException {
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild();
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild();
         File[] files = new File(resourceDirectory).listFiles();
 
         for (File file : files) {
@@ -70,7 +70,7 @@ public final class TestUtils {
 
     public static SchemaContext loadModuleResources(final Class<?> refClass, final String... resourceNames)
             throws IOException, ReactorException, YangSyntaxErrorException {
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild();
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild();
 
         for (String resourceName : resourceNames) {
             reactor.addSource(YangStatementStreamSource.create(YangTextSchemaSource.forResource(refClass,
@@ -82,7 +82,7 @@ public final class TestUtils {
 
     public static SchemaContext loadYinModules(final URI resourceDirectory) throws ReactorException, SAXException,
             IOException {
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild();
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild();
 
         for (File file : new File(resourceDirectory).listFiles()) {
             reactor.addSource(YinStatementStreamSource.create(YinTextToDomTransformer.transformSource(
@@ -94,7 +94,7 @@ public final class TestUtils {
 
     public static Module loadYinModule(final YinTextSchemaSource source) throws ReactorException, SAXException,
             IOException {
-        final SchemaContext ctx = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext ctx = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(YinStatementStreamSource.create(YinTextToDomTransformer.transformSource(source)))
                 .buildEffective();
         return ctx.getModules().iterator().next();
@@ -198,7 +198,7 @@ public final class TestUtils {
     }
 
     public static SchemaContext parseYangSources(final StatementStreamSource... sources) throws ReactorException {
-        return DefaultReactors.defaultReactor().newBuild().addSources(sources).buildEffective();
+        return RFC7950Reactors.defaultReactor().newBuild().addSources(sources).buildEffective();
     }
 
     public static SchemaContext parseYangSources(final File... files)

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java
index 2ea8798b774804147278cca5de79d4839aa588f1..b967de0b7dd2b9d9798541f2c43127aa0068c74e 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java
@@ -17,14 +17,14 @@ import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class TypedefSubStmtsTest {
 
     @Test
     public void typedefSubStmtsTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/typedef-substmts-test/typedef-substmts-test.yang"))
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java
index 05c01fe7df4fd24c0a05cc9af6457730ae2dcdbb..b6ed4af0709ebd5efc5bb5a65b7f95bfc384d81d 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java
@@ -40,7 +40,7 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.meta.SomeModifiersUnresolvedException;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
@@ -351,7 +351,7 @@ public class TypesResolutionTest {
 
     @Test
     public void testUnionWithExt() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/types/union-with-ext/extdef.yang"))
                 .addSource(sourceForResource("/types/union-with-ext/unionbug.yang"))
                 .addSource(sourceForResource("/ietf/ietf-inet-types@2010-09-24.yang"))
@@ -361,7 +361,7 @@ public class TypesResolutionTest {
 
     @Test
     public void testUnionWithBits() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/types/union-with-bits/union-bits-model.yang"))
                 .buildEffective();
         assertNotNull(result);
@@ -369,7 +369,7 @@ public class TypesResolutionTest {
 
     @Test
     public void testUnionInList() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/types/union-in-list/unioninlisttest.yang"));
 
         try {

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangDataExtensionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangDataExtensionTest.java
index 8d7c19da3b666f806823a6ca1835ee3c7e48dfcd..e40d9bba43b9f67a02e35382ea9f57928a92ab93 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangDataExtensionTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangDataExtensionTest.java
@@ -60,7 +60,9 @@ public class YangDataExtensionTest {
 
     @Test
     public void testYangData() throws Exception {
-        final SchemaContext schemaContext = StmtTestUtils.parseYangSources(FOO_MODULE, IETF_RESTCONF_MODULE);
+        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+                .addSources(FOO_MODULE, IETF_RESTCONF_MODULE)
+                .buildEffective();
         assertNotNull(schemaContext);
 
         final Set<ExtensionDefinition> extensions = schemaContext.getExtensions();
@@ -91,7 +93,9 @@ public class YangDataExtensionTest {
 
     @Test
     public void testConfigStatementBeingIgnoredInYangDataBody() throws Exception {
-        final SchemaContext schemaContext = StmtTestUtils.parseYangSources(BAZ_MODULE, IETF_RESTCONF_MODULE);
+        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+                .addSources(BAZ_MODULE, IETF_RESTCONF_MODULE)
+                .buildEffective();
         assertNotNull(schemaContext);
 
         final Module baz = schemaContext.findModule("baz", REVISION).get();
@@ -147,7 +151,9 @@ public class YangDataExtensionTest {
     public void testYangDataBeingIgnored() throws Exception {
         // yang-data statement is ignored if it does not appear as a top-level statement
         // i.e., it will not appear in the final SchemaContext
-        final SchemaContext schemaContext = StmtTestUtils.parseYangSources(BAR_MODULE, IETF_RESTCONF_MODULE);
+        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+                .addSources(BAR_MODULE, IETF_RESTCONF_MODULE)
+                .buildEffective();
         assertNotNull(schemaContext);
 
         final Module bar = schemaContext.findModule("bar", REVISION).get();
@@ -165,7 +171,8 @@ public class YangDataExtensionTest {
     @Test
     public void testYangDataWithMissingTopLevelContainer() {
         try {
-            StmtTestUtils.parseYangSources(FOO_INVALID_1_MODULE, IETF_RESTCONF_MODULE);
+            DefaultReactors.defaultReactor().newBuild().addSources(FOO_INVALID_1_MODULE, IETF_RESTCONF_MODULE)
+            .buildEffective();
             fail("Exception should have been thrown because of missing top-level container in yang-data statement.");
         } catch (final ReactorException ex) {
             final Throwable cause = ex.getCause();
@@ -177,7 +184,8 @@ public class YangDataExtensionTest {
     @Test
     public void testYangDataWithTwoTopLevelContainers() {
         try {
-            StmtTestUtils.parseYangSources(FOO_INVALID_2_MODULE, IETF_RESTCONF_MODULE);
+            DefaultReactors.defaultReactor().newBuild().addSources(FOO_INVALID_2_MODULE, IETF_RESTCONF_MODULE)
+            .buildEffective();
             fail("Exception should have been thrown because of two top-level containers in yang-data statement.");
         } catch (final ReactorException ex) {
             final Throwable cause = ex.getCause();
@@ -189,7 +197,8 @@ public class YangDataExtensionTest {
     @Test
     public void testYangDataWithInvalidToplevelNode() {
         try {
-            StmtTestUtils.parseYangSources(FOO_INVALID_3_MODULE, IETF_RESTCONF_MODULE);
+            DefaultReactors.defaultReactor().newBuild().addSources(FOO_INVALID_3_MODULE, IETF_RESTCONF_MODULE)
+            .buildEffective();
             fail("Exception should have been thrown because of invalid top-level node in yang-data statement.");
         } catch (final ReactorException ex) {
             final Throwable cause = ex.getCause();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java
index 7b07a3b995098735caf980c03c64c85ca750291f..f2c47245ad24bda2b7ca0177df71d990ba4270f1 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java
@@ -12,7 +12,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.EffectiveModelContext;
@@ -43,7 +43,7 @@ public class YangFileStmtTest {
 
     @Test
     public void readAndParseYangFileTestModel() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(BAZ, FOO, BAR, SUBFOO)
                 .build();
         assertNotNull(result);
@@ -51,7 +51,7 @@ public class YangFileStmtTest {
 
     @Test
     public void readAndParseYangFileTestModel2() throws ReactorException {
-        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+        EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(BAZ2, FOO2, BAR2, SUBFOO2)
                 .build();
         assertNotNull(result);
@@ -59,7 +59,7 @@ public class YangFileStmtTest {
 
     @Test
     public void readAndParseYangFileTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(YANGFILE, SIMPLENODES, IMPORTEDYANGFILE, FOOBAR, EXTFILE, EXTUSE)
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
index 3aefd3d0619949219feee605f570257c8172eaed..4c8298bd19b939746bf021ba7d0ade14ac1192ab 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
@@ -64,7 +64,7 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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.meta.SomeModifiersUnresolvedException;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
@@ -725,7 +725,7 @@ public class YangParserTest {
 
     @Test
     public void unknownStatementBetweenRevisionsTest() throws ReactorException {
-        final SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/yang-grammar-test/revisions-extension.yang"))
                 .addSource(sourceForResource("/yang-grammar-test/submodule-header-extension.yang"))
                 .buildEffective();
@@ -742,7 +742,7 @@ public class YangParserTest {
         final StatementStreamSource yangFile3 = sourceForResource(
                 "/yang-grammar-test/stmtsep-in-statements-sub.yang");
 
-        final BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
+        final BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(yangFile1, yangFile2, yangFile3);
         // TODO: change test or create new module in order to respect new statement parser validations
         try {

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 365d10f172ba9e4d682a43f9ca94df9f6926146d..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
@@ -45,7 +45,7 @@ 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.impl.DefaultReactors;
+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;
 
@@ -71,7 +71,7 @@ public class YangParserWithContextTest {
 
     @Test
     public void testTypeFromContext() throws ReactorException {
-        final SchemaContext context = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IETF)
                 .addSource(sourceForResource("/types/custom-types-test@2012-04-04.yang"))
                 .addSource(sourceForResource("/context-test/test1.yang"))
@@ -105,7 +105,7 @@ public class YangParserWithContextTest {
 
     @Test
     public void testUsesFromContext() throws ReactorException {
-        final SchemaContext context = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(BAZ, FOO, BAR, SUBFOO, sourceForResource("/context-test/test2.yang"))
                 .buildEffective();
 
@@ -209,7 +209,7 @@ public class YangParserWithContextTest {
 
     @Test
     public void testUsesRefineFromContext() throws ReactorException {
-        final SchemaContext context = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(BAZ, FOO, BAR, SUBFOO, sourceForResource("/context-test/test2.yang"))
                 .buildEffective();
 
@@ -280,7 +280,7 @@ public class YangParserWithContextTest {
 
     @Test
     public void testIdentity() throws ReactorException {
-        final SchemaContext context = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IETF)
                 .addSource(sourceForResource("/types/custom-types-test@2012-04-04.yang"))
                 .addSource(sourceForResource("/context-test/test3.yang"))
@@ -305,7 +305,7 @@ public class YangParserWithContextTest {
 
     @Test
     public void testUnknownNodes() throws ReactorException {
-        final SchemaContext context = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(IETF)
                 .addSource(sourceForResource("/types/custom-types-test@2012-04-04.yang"))
                 .addSource(sourceForResource("/context-test/test3.yang"))
@@ -364,7 +364,7 @@ public class YangParserWithContextTest {
 
     @Test
     public void testDeviation() throws ReactorException {
-        final SchemaContext context = DefaultReactors.defaultReactor().newBuild()
+        final SchemaContext context = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(sourceForResource("/model/bar.yang"))
                 .addSource(sourceForResource("/context-test/deviation-test.yang"))
                 .buildEffective();

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
index 27a53ed45fe61c842adc2f2127187dc02cf78725..37cac7aa20e40264b5d7906743abf7f2ba9511d6 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
@@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -49,7 +49,7 @@ public class YangTypes2StmtTest {
 
     @Test
     public void readAndParseYangFileTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(TYPEFILE1, TYPEFILE2, TYPEFILE3, TYPEFILE4)
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java
index a0160f1e45336184f4a311071ab4e1b9a3ca536d..4579104ef70c088d4ff9ed17d8159fcd07ee0083 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java
@@ -12,7 +12,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+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;
 
@@ -32,7 +32,7 @@ public class YangTypesStmtTest {
 
     @Test
     public void readAndParseYangFileTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(TYPEFILE1, TYPEFILE2, TYPEFILE3, FILE1, FILE2, FILE3, FILE4)
                 .buildEffective();
         assertNotNull(result);

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java
index 0a229e2d204d5bea99edbf14efe82d784525bd6c..7e8abc798e838dea50c59468c20ed87ce90150ec 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java
@@ -18,7 +18,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.repo.api.YinTextSchemaSource;
-import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors;
+import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinTextToDomTransformer;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
@@ -55,7 +55,7 @@ public class YinFileStmtTest {
 
     @Test
     public void readAndParseYinFileTestModel() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(YIN_FILE, EXT_FILE, EXT_USE_FILE)
                 .buildEffective();
         assertNotNull(result);
@@ -64,7 +64,7 @@ public class YinFileStmtTest {
     // parsing yin file whose import statement references a module which does not exist
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void readAndParseInvalidYinFileTest() throws ReactorException {
-        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+        SchemaContext result = RFC7950Reactors.defaultReactor().newBuild()
                 .addSource(INVALID_YIN_FILE)
                 .buildEffective();
         assertNotNull(result);
@@ -72,8 +72,7 @@ public class YinFileStmtTest {
 
     // parsing yin file with duplicate key name in a list statement
     public void readAndParseInvalidYinFileTest2() {
-        BuildAction reactor = DefaultReactors.defaultReactor().newBuild()
-                .addSource(INVALID_YIN_FILE_2);
+        BuildAction reactor = RFC7950Reactors.defaultReactor().newBuild().addSource(INVALID_YIN_FILE_2);
 
         try {
             reactor.buildEffective();