Update StmtTestUtils

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

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 30990b468861e836d6df1868c4fc112a46c29277..a672030f0dd7f0fbee100d0d25afaba81ea62528 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
@@ -11,9 +11,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
-import java.io.FileNotFoundException;
-import java.net.URISyntaxException;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
@@ -21,29 +20,28 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 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;
+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.DescriptionStatementImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.IncludeStatementImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ModuleStatementImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ReferenceStatementImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl;
 import org.opendaylight.yangtools.yang.stmt.StmtTestUtils;
 
 public class Bug6874Test {
 
-    private static final YangStatementSourceImpl ROOT_MODULE = new YangStatementSourceImpl
-            ("/rfc7950/include-import-stmt-test/valid-11/root-module.yang", false);
-    private static final YangStatementSourceImpl CHILD_MODULE = new YangStatementSourceImpl
-            ("/rfc7950/include-import-stmt-test/valid-11/child-module.yang", false);
-    private static final YangStatementSourceImpl CHILD_MODULE_1 = new YangStatementSourceImpl
-            ("/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang", false);
-    private static final YangStatementSourceImpl IMPORTED_MODULE = new YangStatementSourceImpl
-            ("/rfc7950/include-import-stmt-test/valid-11/imported-module.yang", false);
+    private static final StatementStreamSource ROOT_MODULE = sourceForResource
+            ("/rfc7950/include-import-stmt-test/valid-11/root-module.yang");
+    private static final StatementStreamSource CHILD_MODULE = sourceForResource
+            ("/rfc7950/include-import-stmt-test/valid-11/child-module.yang");
+    private static final StatementStreamSource CHILD_MODULE_1 = sourceForResource
+            ("/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang");
+    private static final StatementStreamSource IMPORTED_MODULE = sourceForResource
+            ("/rfc7950/include-import-stmt-test/valid-11/imported-module.yang");
 
     @Test
-    public void valid11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException {
+    public void valid11Test() throws Exception {
         final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/valid-11");
         assertNotNull(schemaContext);
 
@@ -58,38 +56,40 @@ public class Bug6874Test {
     }
 
     @Test
-    public void invalid10IncludeStmtTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException {
+    public void invalid10IncludeStmtTest() throws Exception {
         try {
             StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/invalid-include-10");
             fail("Test must fail: DESCRIPTION/REFERENCE are not valid for INCLUDE in Yang 1.0");
         } catch (final SomeModifiersUnresolvedException e) {
             final String msg = e.getCause().getMessage();
-            assertTrue(msg.startsWith("DESCRIPTION is not valid for INCLUDE") || msg.startsWith("REFERENCE is not valid for INCLUDE"));
+            assertTrue(msg.startsWith("DESCRIPTION is not valid for INCLUDE")
+                || msg.startsWith("REFERENCE is not valid for INCLUDE"));
         }
     }
 
     @Test
-    public void invalid10ImportStmtTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException {
+    public void invalid10ImportStmtTest() throws Exception {
         try {
             StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/invalid-import-10");
             fail("Test must fail: DESCRIPTION/REFERENCE are not valid for IMPORT in Yang 1.0");
         } catch (final SomeModifiersUnresolvedException e) {
             final String msg = e.getCause().getMessage();
-            assertTrue(msg.startsWith("DESCRIPTION is not valid for IMPORT") || msg.startsWith("REFERENCE is not valid for IMPORT"));
+            assertTrue(msg.startsWith("DESCRIPTION is not valid for IMPORT")
+                || msg.startsWith("REFERENCE is not valid for IMPORT"));
         }
     }
 
     @Test
     public void descriptionAndReferenceTest11() throws ReactorException {
         final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        StmtTestUtils.addSources(reactor, ROOT_MODULE, CHILD_MODULE, CHILD_MODULE_1, IMPORTED_MODULE);
+        reactor.addSources(ROOT_MODULE, CHILD_MODULE, CHILD_MODULE_1, IMPORTED_MODULE);
 
         reactor.build().getRootStatements().forEach(declaredStmt -> {
             if(declaredStmt instanceof ModuleStatementImpl) {
                 declaredStmt.declaredSubstatements().forEach(subStmt -> {
                     if (subStmt instanceof IncludeStatementImpl &&
                             subStmt.rawArgument().equals("child-module")) {
-                        subStmt.declaredSubstatements().forEach(includeSubStmt -> { verifyDescAndRef(includeSubStmt); });
+                        subStmt.declaredSubstatements().forEach(Bug6874Test::verifyDescAndRef);
                     }
                 });
             }
@@ -97,9 +97,10 @@ public class Bug6874Test {
     }
 
     @SuppressWarnings("rawtypes")
-    private void verifyDescAndRef (DeclaredStatement stmt) {
+    private static void verifyDescAndRef (final DeclaredStatement stmt) {
         if (stmt instanceof DescriptionStatementImpl) {
-            assertEquals("Yang 1.1: Allow description and reference in include and import.", ((DescriptionStatementImpl) stmt).argument());
+            assertEquals("Yang 1.1: Allow description and reference in include and import.",
+                ((DescriptionStatementImpl) stmt).argument());
         }
         if (stmt instanceof ReferenceStatementImpl) {
             assertEquals("https://tools.ietf.org/html/rfc7950 section-7.1.5/6", ((ReferenceStatementImpl) stmt).argument());