X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-rfc7950%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fstmt%2FEffectiveModulesAndSubmodulesTest.java;h=120000a3bafe6286a2b82b7f608f553d67ef957a;hb=c4517068c0183a892703b26baf098c97bfb2a854;hp=47d876a4fd8ee455bb52d62ab3960cf4d57c3116;hpb=c8668229ad6e73d5ae03a52f4b87e8e4d2a67c6e;p=yangtools.git

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
index 47d876a4fd..120000a3ba 100644
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.stmt;
 
 import static org.junit.Assert.assertEquals;
@@ -13,16 +12,16 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
-import java.net.URI;
 import java.util.Collection;
 import java.util.Optional;
-import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.Submodule;
 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;
@@ -40,7 +39,7 @@ public class EffectiveModulesAndSubmodulesTest {
     private static final StatementStreamSource SUBMODULE_TO_SUBMODULE_1 = sourceForResource(
             "/stmt-test/submodules/submodule-to-submodule-1.yang");
 
-    private static final QNameModule ROOT = QNameModule.create(URI.create("root-module"));
+    private static final QNameModule ROOT = QNameModule.create(XMLNamespace.of("root-module"));
 
     @Test
     public void modulesAndSubmodulesSimpleReferencesTest() throws ReactorException {
@@ -50,7 +49,7 @@ public class EffectiveModulesAndSubmodulesTest {
 
         assertNotNull(result);
 
-        final Set<Module> modules = result.getModules();
+        final Collection<? extends Module> modules = result.getModules();
         assertNotNull(modules);
         assertEquals(2, modules.size());
 
@@ -73,9 +72,8 @@ public class EffectiveModulesAndSubmodulesTest {
         assertNotNull(root);
         assertNotNull(imported);
 
-        final Collection<DataSchemaNode> rootChildNodes = root.getChildNodes();
-        final Collection<DataSchemaNode> importedChildNodes = imported
-                .getChildNodes();
+        final Collection<? extends DataSchemaNode> rootChildNodes = root.getChildNodes();
+        final Collection<? extends DataSchemaNode> importedChildNodes = imported.getChildNodes();
 
         assertNotNull(rootChildNodes);
         assertNotNull(importedChildNodes);
@@ -83,8 +81,8 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(3, rootChildNodes.size());
         assertEquals(1, importedChildNodes.size());
 
-        final Set<Module> rootSubmodules = root.getSubmodules();
-        final Set<Module> importedSubmodules = imported.getSubmodules();
+        final Collection<? extends Submodule> rootSubmodules = root.getSubmodules();
+        final Collection<? extends Submodule> importedSubmodules = imported.getSubmodules();
 
         assertNotNull(rootSubmodules);
         assertNotNull(importedSubmodules);
@@ -92,9 +90,9 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(2, rootSubmodules.size());
         assertEquals(0, importedSubmodules.size());
 
-        Module sub1 = null;
-        Module sub2 = null;
-        for (final Module rootSubmodule : rootSubmodules) {
+        Submodule sub1 = null;
+        Submodule sub2 = null;
+        for (final Submodule rootSubmodule : rootSubmodules) {
             switch (rootSubmodule.getName()) {
                 case "submodule-1":
                     sub1 = rootSubmodule;
@@ -112,8 +110,8 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(ROOT, sub1.getQNameModule());
         assertEquals(ROOT, sub2.getQNameModule());
 
-        final Collection<DataSchemaNode> sub1ChildNodes = sub1.getChildNodes();
-        final Collection<DataSchemaNode> sub2ChildNodes = sub2.getChildNodes();
+        final Collection<? extends DataSchemaNode> sub1ChildNodes = sub1.getChildNodes();
+        final Collection<? extends DataSchemaNode> sub2ChildNodes = sub2.getChildNodes();
 
         assertNotNull(sub1ChildNodes);
         assertNotNull(sub2ChildNodes);
@@ -121,8 +119,8 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(1, sub1ChildNodes.size());
         assertEquals(1, sub2ChildNodes.size());
 
-        final Set<Module> sub1Submodules = sub1.getSubmodules();
-        final Set<Module> sub2Submodules = sub2.getSubmodules();
+        final Collection<? extends Submodule> sub1Submodules = sub1.getSubmodules();
+        final Collection<? extends Submodule> sub2Submodules = sub2.getSubmodules();
 
         assertNotNull(sub1Submodules);
         assertNotNull(sub2Submodules);
@@ -130,8 +128,8 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(1, sub1Submodules.size());
         assertEquals(0, sub2Submodules.size());
 
-        Module sub1Submodule = null;
-        for (final Module submodule : sub1Submodules) {
+        Submodule sub1Submodule = null;
+        for (final Submodule submodule : sub1Submodules) {
             switch (submodule.getName()) {
                 case "submodule-to-submodule-1":
                     sub1Submodule = submodule;
@@ -144,11 +142,11 @@ public class EffectiveModulesAndSubmodulesTest {
 
         assertEquals(ROOT, sub1Submodule.getQNameModule());
 
-        final Collection<DataSchemaNode> sub1SubmoduleChildNodes = sub1Submodule.getChildNodes();
+        final Collection<? extends DataSchemaNode> sub1SubmoduleChildNodes = sub1Submodule.getChildNodes();
         assertNotNull(sub1SubmoduleChildNodes);
         assertEquals(1, sub1SubmoduleChildNodes.size());
 
-        final Set<Module> sub1SubmoduleSubmodules = sub1Submodule.getSubmodules();
+        final Collection<? extends Submodule> sub1SubmoduleSubmodules = sub1Submodule.getSubmodules();
         assertNotNull(sub1SubmoduleSubmodules);
         assertEquals(0, sub1SubmoduleSubmodules.size());
 
@@ -166,8 +164,8 @@ public class EffectiveModulesAndSubmodulesTest {
 
     private static void findModulesSubTest(final SchemaContext result, final Module root, final Module imported) {
         final Module foundRoot = result.findModule("root-module").get();
-        final Set<Module> foundRoots = result.findModules(URI.create("root-module"));
-        final Module foundRoot3 = result.findModule(URI.create("root-module")).get();
+        final Collection<? extends Module> foundRoots = result.findModules(XMLNamespace.of("root-module"));
+        final Module foundRoot3 = result.findModule(XMLNamespace.of("root-module")).get();
 
         assertNotNull(foundRoot);
         assertNotNull(foundRoots);
@@ -182,8 +180,8 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(root, foundRoot3);
 
         final Module foundImported = result.findModule("imported-module").get();
-        final Set<Module> foundImporteds = result.findModules(URI.create("imported-module"));
-        final Module foundImported3 = result.findModule(URI.create("imported-module")).get();
+        final Collection<? extends Module> foundImporteds = result.findModules(XMLNamespace.of("imported-module"));
+        final Module foundImported3 = result.findModule(XMLNamespace.of("imported-module")).get();
 
         assertNotNull(foundImported);
         assertNotNull(foundImporteds);