YANGTOOLS-706: Refactor YangInferencePipeline

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / Bug7480Test.java

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 99f0632c764f92f5004811a7ac2ae3c903237aa0..02eadfb6ca0b5309dee55193a288522e07c032af 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,9 +18,8 @@ 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.spi.meta.SomeModifiersUnresolvedException;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
 
 public class Bug7480Test {
     @Test
@@ -62,14 +61,15 @@ 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 CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        reactor.addSource(StmtTestUtils.sourceForResource(
-                "/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang"));
-        reactor.addLibSources(StmtTestUtils.sourceForResource(
-                "/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang"),
-                StmtTestUtils.sourceForResource(
-                        "/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang"));
-        final SchemaContext schemaContext = reactor.buildEffective();
+        final SchemaContext schemaContext =  DefaultReactors.defaultReactor().newBuild()
+                .addSource(StmtTestUtils.sourceForResource(
+                        "/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang"))
+                .addLibSources(
+                    StmtTestUtils.sourceForResource(
+                        "/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang"),
+                    StmtTestUtils.sourceForResource(
+                        "/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang"))
+                .buildEffective();
         assertNotNull(schemaContext);
     }
 
@@ -77,14 +77,15 @@ 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 CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        reactor.addSource(StmtTestUtils.sourceForResource(
-                "/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang"));
-        reactor.addLibSources(StmtTestUtils.sourceForResource(
-                "/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang"),
-                StmtTestUtils.sourceForResource(
-                        "/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang"));
-        final SchemaContext schemaContext = reactor.buildEffective();
+        final SchemaContext schemaContext = DefaultReactors.defaultReactor().newBuild()
+                .addSource(StmtTestUtils.sourceForResource(
+                        "/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang"))
+                .addLibSources(
+                    StmtTestUtils.sourceForResource(
+                            "/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang"),
+                    StmtTestUtils.sourceForResource(
+                            "/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang"))
+                .buildEffective();
         assertNotNull(schemaContext);
     }
 }