BUG-4688: Rework SchemaContext module lookups

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / util / SchemaContextUtilTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java
index 0c098d96aa988fc00ae77614be481458422884af..3425c68280cac68bdfcb35a23b9f2cfc18a3ed8a 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/SchemaContextUtilTest.java
@@ -10,17 +10,21 @@ package org.opendaylight.yangtools.yang.parser.util;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.util.Collections;
+import java.util.Optional;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
@@ -50,6 +54,7 @@ public class SchemaContextUtilTest {
     @Test
     public void testFindDummyData() {
         MockitoAnnotations.initMocks(this);
+        doReturn(Optional.empty()).when(mockSchemaContext).findModule(any(QNameModule.class));
 
         final QName qName = QName.create("TestQName");
         final SchemaPath schemaPath = SchemaPath.create(Collections.singletonList(qName), true);
@@ -78,8 +83,7 @@ public class SchemaContextUtilTest {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
 
-        final Module myModule = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module myModule = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
 
         SchemaNode testNode = ((ContainerSchemaNode) myModule.getDataChildByName(QName.create(
                 myModule.getQNameModule(), "my-container"))).getDataChildByName(QName.create(myModule.getQNameModule(),
@@ -197,8 +201,7 @@ public class SchemaContextUtilTest {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
 
-        final Module myModule = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module myModule = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
 
         SchemaNode testNode = ((ContainerSchemaNode) myModule.getDataChildByName(QName.create(
                 myModule.getQNameModule(), "my-container"))).getDataChildByName(QName.create(myModule.getQNameModule(),
@@ -296,8 +299,7 @@ public class SchemaContextUtilTest {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
 
-        final Module myModule = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module myModule = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
 
         SchemaNode testNode = myModule.getDataChildByName(QName.create(myModule.getQNameModule(), "my-container"));
 
@@ -363,8 +365,7 @@ public class SchemaContextUtilTest {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
 
-        final Module myModule = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module myModule = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
 
         final DataSchemaNode node = myModule
                 .getDataChildByName(QName.create(myModule.getQNameModule(), "my-container"));
@@ -419,13 +420,10 @@ public class SchemaContextUtilTest {
     @Test
     public void findDataSchemaNodeTest() throws URISyntaxException, IOException, YangSyntaxErrorException,
             ReactorException {
-
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
-
-        final Module module = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
-        final Module importedModule = context.findModuleByNamespaceAndRevision(new URI("uri:imported-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module module = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
+        final Module importedModule = context.findModule(new URI("uri:imported-module"),
+            QName.parseRevision("2014-10-07")).get();
 
         final SchemaNode testNode = ((ContainerSchemaNode) importedModule.getDataChildByName(QName.create(
                 importedModule.getQNameModule(), "my-imported-container"))).getDataChildByName(QName.create(
@@ -448,9 +446,7 @@ public class SchemaContextUtilTest {
         // final RevisionAwareXPath nonCondXPath) {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
-
-        final Module module = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module module = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
 
         final GroupingDefinition grouping = getGroupingByName(module, "my-grouping");
         final SchemaNode testNode = grouping.getDataChildByName(QName.create(module.getQNameModule(),
@@ -536,9 +532,7 @@ public class SchemaContextUtilTest {
             YangSyntaxErrorException, ParseException, ReactorException {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
-
-        final Module myModule = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module myModule = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
 
         // find grouping in container
         DataNodeContainer dataContainer = (DataNodeContainer) myModule.getDataChildByName(QName.create(
@@ -738,8 +732,7 @@ public class SchemaContextUtilTest {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
 
-        final Module myModule = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
+        final Module myModule = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
 
         // find grouping in container
         DataNodeContainer dataContainer = (DataNodeContainer) myModule.getDataChildByName(QName.create(
@@ -878,9 +871,7 @@ public class SchemaContextUtilTest {
 
         final SchemaContext context = TestUtils.parseYangSources("/schema-context-util-test");
 
-        final Module myModule = context.findModuleByNamespaceAndRevision(new URI("uri:my-module"),
-                QName.parseRevision("2014-10-07"));
-
+        final Module myModule = context.findModule(new URI("uri:my-module"), QName.parseRevision("2014-10-07")).get();
         final ChoiceSchemaNode choice = (ChoiceSchemaNode) getRpcByName(myModule, "my-name").getInput()
                 .getDataChildByName(QName.create(myModule.getQNameModule(), "my-choice"));
         final SchemaNode testNode = choice.getCaseNodeByName("case-two").getDataChildByName(
@@ -894,7 +885,5 @@ public class SchemaContextUtilTest {
         assertNotNull(testNode);
         assertNotNull(foundNode);
         assertEquals(testNode, foundNode);
-
     }
-
 }
\ No newline at end of file