YANGTOOLS-706: Refactor YangInferencePipeline

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

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 82d9967e3b0425f8817823229708cb552858e7ae..7b07a3b995098735caf980c03c64c85ca750291f 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,12 +12,10 @@ 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.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
 
 public class YangFileStmtTest {
     //basic statements to parse and write
@@ -44,29 +42,26 @@ public class YangFileStmtTest {
     private static final StatementStreamSource SUBFOO2 = sourceForResource("/model/subfoo.yang");
 
     @Test
-    public void readAndParseYangFileTestModel() throws SourceException, ReactorException {
-        CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        reactor.addSources(BAZ,FOO,BAR,SUBFOO);
-        EffectiveModelContext result = reactor.build();
+    public void readAndParseYangFileTestModel() throws ReactorException {
+        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+                .addSources(BAZ, FOO, BAR, SUBFOO)
+                .build();
         assertNotNull(result);
     }
 
     @Test
-    public void readAndParseYangFileTestModel2() throws SourceException, ReactorException {
-        CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-
-        reactor.addSources(BAZ2,FOO2,BAR2,SUBFOO2);
-        EffectiveModelContext result = reactor.build();
+    public void readAndParseYangFileTestModel2() throws ReactorException {
+        EffectiveModelContext result = DefaultReactors.defaultReactor().newBuild()
+                .addSources(BAZ2, FOO2, BAR2, SUBFOO2)
+                .build();
         assertNotNull(result);
     }
 
     @Test
-    public void readAndParseYangFileTest() throws SourceException, ReactorException {
-        CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        reactor.addSources(YANGFILE, SIMPLENODES, IMPORTEDYANGFILE, FOOBAR);
-        reactor.addSources(EXTFILE, EXTUSE);
-        SchemaContext result = reactor.buildEffective();
+    public void readAndParseYangFileTest() throws ReactorException {
+        SchemaContext result = DefaultReactors.defaultReactor().newBuild()
+                .addSources(YANGFILE, SIMPLENODES, IMPORTEDYANGFILE, FOOBAR, EXTFILE, EXTUSE)
+                .buildEffective();
         assertNotNull(result);
     }
 }
\ No newline at end of file