Allow fluent use of BuildAction

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

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 9f96a0f26c50839879d380dc092b2a41a26d6e87..8d7f688e96eb7bc6fe14d86f763627d31a6b25b2 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
@@ -30,7 +30,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 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;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
 
 public class AugmentProcessTest {
@@ -87,51 +86,41 @@ public class AugmentProcessTest {
 
     @Test
     public void multipleAugmentsAndMultipleModulesTest() throws ReactorException {
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
-                .newBuild();
-        addSources(reactor, MULTIPLE_AUGMENT_ROOT, MULTIPLE_AUGMENT_IMPORTED,
-                MULTIPLE_AUGMENT_SUBMODULE);
-
-        SchemaContext result = reactor.buildEffective();
+        SchemaContext result = YangInferencePipeline.RFC6020_REACTOR.newBuild()
+                .addSources(MULTIPLE_AUGMENT_ROOT, MULTIPLE_AUGMENT_IMPORTED, MULTIPLE_AUGMENT_SUBMODULE)
+                .buildEffective();
         assertNotNull(result);
     }
 
     @Test
     public void multipleAugmentTest() throws ReactorException {
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
-                .newBuild();
-        addSources(reactor, MULTIPLE_AUGMENT);
-
-        SchemaContext result = reactor.buildEffective();
+        SchemaContext result = YangInferencePipeline.RFC6020_REACTOR.newBuild()
+                .addSource(MULTIPLE_AUGMENT)
+                .buildEffective();
         assertNotNull(result);
     }
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void multipleAugmentIncorrectPathTest() throws  ReactorException {
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
-                .newBuild();
-        addSources(reactor, MULTIPLE_AUGMENT_INCORRECT);
-
-        SchemaContext result = reactor.buildEffective();
+        SchemaContext result = YangInferencePipeline.RFC6020_REACTOR.newBuild()
+                .addSource(MULTIPLE_AUGMENT_INCORRECT)
+                .buildEffective();
         assertNull(result);
     }
 
     @Test(expected = SomeModifiersUnresolvedException.class)
     public void multipleAugmentIncorrectPathAndGrpTest() throws  ReactorException {
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
-                .newBuild();
-        addSources(reactor, MULTIPLE_AUGMENT_INCORRECT2);
-        SchemaContext result = reactor.buildEffective();
+        SchemaContext result = YangInferencePipeline.RFC6020_REACTOR.newBuild()
+                .addSource(MULTIPLE_AUGMENT_INCORRECT2)
+                .buildEffective();
         assertNull(result);
     }
 
     @Test
     public void readAndParseYangFileTest() throws ReactorException {
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
-                .newBuild();
-        addSources(reactor, AUGMENTED, ROOT);
-
-        final SchemaContext root = reactor.buildEffective();
+        final SchemaContext root = YangInferencePipeline.RFC6020_REACTOR.newBuild()
+                .addSources(AUGMENTED, ROOT)
+                .buildEffective();
         assertNotNull(root);
 
         final Module augmentedModule = root.findModules("augmented").iterator().next();
@@ -172,13 +161,6 @@ public class AugmentProcessTest {
         assertNotNull(grpAddNode);
     }
 
-    private static void addSources(final CrossSourceStatementReactor.BuildAction reactor,
-            final StatementStreamSource... sources) {
-        for (final StatementStreamSource source : sources) {
-            reactor.addSource(source);
-        }
-    }
-
     @Test
     public void caseShortHandAugmentingTest() throws Exception {
         final SchemaContext context = StmtTestUtils.parseYangSources("/choice-case-type-test-models");