BUG-4688: eliminate SimpleDateFormatUtil.DEFAULT_DATE_REV

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

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
index 71fa0f091998304b4c0f267405a1a364a565489d..fe851f27696955595e0f41563bc46a0f954623db 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
@@ -14,18 +14,15 @@ import static org.junit.Assert.assertNotNull;
 import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Collection;
 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.SimpleDateFormatUtil;
 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.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.rfc6020.YangInferencePipeline;
@@ -44,8 +41,7 @@ public class EffectiveModulesAndSubmodulesTest {
             "/stmt-test/submodules/submodule-to-submodule-1.yang");
 
     @Test
-    public void modulesAndSubmodulesSimpleReferencesTest()
-            throws SourceException, ReactorException, URISyntaxException {
+    public void modulesAndSubmodulesSimpleReferencesTest() throws ReactorException {
         final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
                 .newBuild();
         reactor.addSources(ROOT_MODULE, IMPORTED_MODULE,
@@ -62,13 +58,13 @@ public class EffectiveModulesAndSubmodulesTest {
         Module imported = null;
         for (final Module module : modules) {
             switch (module.getName()) {
-            case "root-module":
-                root = module;
-                break;
-            case "imported-module":
-                imported = module;
-                break;
-            default:
+                case "root-module":
+                    root = module;
+                    break;
+                case "imported-module":
+                    imported = module;
+                    break;
+                default:
             }
             StmtTestUtils.printReferences(module, false, "");
             StmtTestUtils.printChilds(module.getChildNodes(), "      ");
@@ -100,23 +96,21 @@ public class EffectiveModulesAndSubmodulesTest {
         Module sub2 = null;
         for (final Module rootSubmodule : rootSubmodules) {
             switch (rootSubmodule.getName()) {
-            case "submodule-1":
-                sub1 = rootSubmodule;
-                break;
-            case "submodule-2":
-                sub2 = rootSubmodule;
-                break;
-            default:
+                case "submodule-1":
+                    sub1 = rootSubmodule;
+                    break;
+                case "submodule-2":
+                    sub2 = rootSubmodule;
+                    break;
+                default:
             }
         }
 
         assertNotNull(sub1);
         assertNotNull(sub2);
 
-        assertEquals(QNameModule.create(new URI("root-module"),
-                SimpleDateFormatUtil.DEFAULT_DATE_REV), sub1.getQNameModule());
-        assertEquals(QNameModule.create(new URI("root-module"),
-                SimpleDateFormatUtil.DEFAULT_DATE_REV), sub2.getQNameModule());
+        assertEquals(QNameModule.create(URI.create("root-module"), null), sub1.getQNameModule());
+        assertEquals(QNameModule.create(URI.create("root-module"), null), sub2.getQNameModule());
 
         final Collection<DataSchemaNode> sub1ChildNodes = sub1.getChildNodes();
         final Collection<DataSchemaNode> sub2ChildNodes = sub2.getChildNodes();
@@ -139,21 +133,18 @@ public class EffectiveModulesAndSubmodulesTest {
         Module sub1Submodule = null;
         for (final Module submodule : sub1Submodules) {
             switch (submodule.getName()) {
-            case "submodule-to-submodule-1":
-                sub1Submodule = submodule;
-                break;
-            default:
+                case "submodule-to-submodule-1":
+                    sub1Submodule = submodule;
+                    break;
+                default:
             }
         }
 
         assertNotNull(sub1Submodule);
 
-        assertEquals(QNameModule.create(new URI("root-module"),
-                SimpleDateFormatUtil.DEFAULT_DATE_REV),
-                sub1Submodule.getQNameModule());
+        assertEquals(QNameModule.create(URI.create("root-module"), null), sub1Submodule.getQNameModule());
 
-        final Collection<DataSchemaNode> sub1SubmoduleChildNodes = sub1Submodule
-                .getChildNodes();
+        final Collection<DataSchemaNode> sub1SubmoduleChildNodes = sub1Submodule.getChildNodes();
         assertNotNull(sub1SubmoduleChildNodes);
         assertEquals(1, sub1SubmoduleChildNodes.size());
 
@@ -164,7 +155,6 @@ public class EffectiveModulesAndSubmodulesTest {
         findModulesSubTest(result, root, imported);
 
         getDataChildByNameSubTest(result, root);
-
     }
 
     private static void getDataChildByNameSubTest(final SchemaContext result, final Module root) {
@@ -174,14 +164,10 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals("desc", containerInRoot.getDescription());
     }
 
-    private static void findModulesSubTest(final SchemaContext result, final Module root, final Module imported)
-            throws URISyntaxException {
-        final Module foundRoot = result.findModuleByName("root-module",
-                SimpleDateFormatUtil.DEFAULT_DATE_REV);
-        final Set<Module> foundRoots = result.findModuleByNamespace(new URI(
-                "root-module"));
-        final Module foundRoot3 = result.findModuleByNamespaceAndRevision(new URI(
-                "root-module"), SimpleDateFormatUtil.DEFAULT_DATE_REV);
+    private static void findModulesSubTest(final SchemaContext result, final Module root, final Module imported) {
+        final Module foundRoot = result.findModule("root-module", null).get();
+        final Set<Module> foundRoots = result.findModules(URI.create("root-module"));
+        final Module foundRoot3 = result.findModule(URI.create("root-module"), null).get();
 
         assertNotNull(foundRoot);
         assertNotNull(foundRoots);
@@ -195,13 +181,9 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(root, foundRoot2);
         assertEquals(root, foundRoot3);
 
-        final Module foundImported = result.findModuleByName("imported-module",
-                SimpleDateFormatUtil.DEFAULT_DATE_REV);
-        final Set<Module> foundImporteds = result.findModuleByNamespace(new URI(
-                "imported-module"));
-        final Module foundImported3 = result.findModuleByNamespaceAndRevision(
-                new URI("imported-module"),
-                SimpleDateFormatUtil.DEFAULT_DATE_REV);
+        final Module foundImported = result.findModule("imported-module", null).get();
+        final Set<Module> foundImporteds = result.findModules(URI.create("imported-module"));
+        final Module foundImported3 = result.findModule(URI.create("imported-module"), null).get();
 
         assertNotNull(foundImported);
         assertNotNull(foundImporteds);
@@ -217,5 +199,4 @@ public class EffectiveModulesAndSubmodulesTest {
 
         assertFalse(root.equals(imported));
     }
-
 }