Remove RevisionSourceIdentifier

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

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
index 3de683e80c4d16b0b1ac27be94250a76c1a28918..343265cbd295042c1ab1db565dae9e94c5504817 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.stmt;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
@@ -20,6 +19,7 @@ import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -32,8 +32,7 @@ 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;
 
-public class MoreRevisionsTest {
-
+public class MoreRevisionsTest extends AbstractYangTest {
     private static final StatementStreamSource REVFILE = sourceForResource(
             "/semantic-statement-parser/revisions/more-revisions-test.yang");
 
@@ -78,13 +77,12 @@ public class MoreRevisionsTest {
 
     @Test
     public void twoRevisionsTest2() throws ReactorException {
-        Collection<? extends Module> modules = RFC7950Reactors.defaultReactor().newBuild()
+        final var context = RFC7950Reactors.defaultReactor().newBuild()
                 .addSources(NETWORK_TOPOLOGY_20130712, NETWORK_TOPOLOGY_20131021, IETF_TYPES)
-                .buildEffective()
-                .getModules();
+                .buildEffective();
 
-        assertEquals(3, modules.size());
-        assertEquals(2, StmtTestUtils.findModules(modules, "network-topology").size());
+        assertEquals(3, context.getModuleStatements().size());
+        assertEquals(2, context.findModules("network-topology").size());
     }
 
     @Test
@@ -96,17 +94,16 @@ public class MoreRevisionsTest {
     }
 
     @Test
-    public void multipleRevisionsTest() throws Exception {
+    public void multipleRevisionsTest() {
         for (int i = 0; i < 100; i++) {
-            assertNotNull(StmtTestUtils.parseYangSources("/semantic-statement-parser/multiple-revisions"));
+            assertEffectiveModelDir("/semantic-statement-parser/multiple-revisions");
         }
     }
 
     @Test
-    public void multipleRevisionsFullTest() throws Exception {
+    public void multipleRevisionsFullTest() {
         for (int i = 0; i < 100; i++) {
-            EffectiveModelContext context =
-                StmtTestUtils.parseYangSources("/semantic-statement-parser/multiple-revisions/full");
+            var context = assertEffectiveModelDir("/semantic-statement-parser/multiple-revisions/full");
             assertEquals(6, context.getModules().size());
             checkContentFullTest(context);
         }
@@ -146,7 +143,7 @@ public class MoreRevisionsTest {
         Collection<? extends ModuleImport> imports = interfacesModule20121115.getImports();
         assertEquals(1, imports.size());
         ModuleImport interfacesImport = imports.iterator().next();
-        assertEquals("ietf-yang-types", interfacesImport.getModuleName());
+        assertEquals(Unqualified.of("ietf-yang-types"), interfacesImport.getModuleName());
         assertEquals(Optional.of(rev20100924), interfacesImport.getRevision());
     }
 
@@ -165,10 +162,9 @@ public class MoreRevisionsTest {
     }
 
     @Test
-    public void multipleRevisionsSimpleTest() throws Exception {
+    public void multipleRevisionsSimpleTest() {
         for (int i = 0; i < 1000; i++) {
-            EffectiveModelContext context = StmtTestUtils.parseYangSources(
-                "/semantic-statement-parser/multiple-revisions/simple");
+            var context = assertEffectiveModelDir("/semantic-statement-parser/multiple-revisions/simple");
             assertEquals(5, context.getModules().size());
             checkContentSimpleTest(context);
         }
@@ -216,7 +212,7 @@ public class MoreRevisionsTest {
         Collection<? extends ModuleImport> imports = interfacesModule20121115.getImports();
         assertEquals(1, imports.size());
         ModuleImport interfacesImport = imports.iterator().next();
-        assertEquals("ietf-yang-types", interfacesImport.getModuleName());
+        assertEquals(Unqualified.of("ietf-yang-types"), interfacesImport.getModuleName());
         assertEquals(Optional.of(rev20100924), interfacesImport.getRevision());
     }
 
@@ -235,7 +231,7 @@ public class MoreRevisionsTest {
         Collection<? extends ModuleImport> imports = monitoringModule19700101.getImports();
         assertEquals(1, imports.size());
         ModuleImport monitoringImport = imports.iterator().next();
-        assertEquals("ietf-yang-types", monitoringImport.getModuleName());
+        assertEquals(Unqualified.of("ietf-yang-types"), monitoringImport.getModuleName());
         assertEquals(Optional.of(rev20130715), monitoringImport.getRevision());
     }
 
@@ -249,9 +245,8 @@ public class MoreRevisionsTest {
     }
 
     @Test
-    public void nodeTest() throws Exception {
-        EffectiveModelContext context = StmtTestUtils.parseYangSources(
-            "/semantic-statement-parser/multiple-revisions/node-test");
+    public void nodeTest() {
+        final var context = assertEffectiveModelDir("/semantic-statement-parser/multiple-revisions/node-test");
 
         QName root = QName.create("foo", "2016-04-06", "foo-root");
         QName container20160404 = QName.create("foo", "2016-04-06", "con20160404");