X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FSimpleSchemaContextTest.java;h=69adaf67258bb378d9758904c629574ed19b45a4;hb=11806151529a522cf0a27b85e210d1eec433a464;hp=1218471b2f8e2916e3d682b2524385bff3d7ad76;hpb=638d4c43bcbfd308b9c80da4f4c286941567d974;p=yangtools.git

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java
index 1218471b2f..69adaf6725 100644
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java
@@ -13,13 +13,14 @@ import static org.mockito.Mockito.mock;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import java.net.URI;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.Module;
 
 public class SimpleSchemaContextTest {
@@ -44,7 +45,7 @@ public class SimpleSchemaContextTest {
         assertFindModules(expected, "foo", foo2, foo0, foo1);
         assertFindModules(expected, "foo", foo2, foo1, foo0);
 
-        final URI uri = URI.create("foo");
+        final XMLNamespace uri = XMLNamespace.of("foo");
         assertFindModules(expected, uri, foo0, foo1, foo2);
         assertFindModules(expected, uri, foo0, foo2, foo1);
         assertFindModules(expected, uri, foo1, foo0, foo2);
@@ -54,28 +55,34 @@ public class SimpleSchemaContextTest {
     }
 
     private static void assertGetModules(final List<Module> expected, final Module... modules) {
-        final Set<Module> actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules)).getModules();
+        final Set<Module> actual = SimpleSchemaContext.forModules(ImmutableList.copyOf(modules)).getModules();
         assertArrayEquals(expected.toArray(), actual.toArray());
     }
 
     private static void assertFindModules(final List<Module> expected, final String name, final Module... modules) {
-        final Set<Module> actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules)).findModules(name);
+        final Collection<? extends Module> actual = SimpleSchemaContext.forModules(ImmutableList.copyOf(modules))
+                .findModules(name);
         assertArrayEquals(expected.toArray(), actual.toArray());
     }
 
-    private static void assertFindModules(final List<Module> expected, final URI uri, final Module... modules) {
-        final Set<Module> actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules)).findModules(uri);
+    private static void assertFindModules(final List<Module> expected, final XMLNamespace uri,
+            final Module... modules) {
+        final Collection<? extends Module> actual = SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules))
+                .findModules(uri);
         assertArrayEquals(expected.toArray(), actual.toArray());
     }
 
     private static Module mockModule(final String name, final Optional<Revision> revision) {
-        final QNameModule mod = QNameModule.create(URI.create(name), revision);
+        final QNameModule mod = QNameModule.create(XMLNamespace.of(name), revision);
         final Module ret = mock(Module.class);
         doReturn(name).when(ret).getName();
         doReturn(mod.getNamespace()).when(ret).getNamespace();
         doReturn(mod.getRevision()).when(ret).getRevision();
         doReturn(mod).when(ret).getQNameModule();
         doReturn(mod.toString()).when(ret).toString();
+        doReturn(ImmutableSet.of()).when(ret).getImports();
+        doReturn(ImmutableSet.of()).when(ret).getSubmodules();
+        doReturn(ImmutableList.of()).when(ret).getUnknownSchemaNodes();
         return ret;
     }
 }