Move SimpleSchemaContext

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

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java
index 6c6407d853620504e646825b623133a2ca1feef3..16806cb05b7e2653291a597183b1db00cf463cbf 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java
@@ -16,7 +16,6 @@ import static org.mockito.Mockito.mock;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -29,17 +28,18 @@ import org.mockito.junit.MockitoJUnitRunner;
 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.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.PathExpression;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class SchemaContextUtilTest {
     public static final Splitter SPACE_SPLITTER = Splitter.on(' ');
-    public static final URI NAMESPACE = URI.create("abc");
+    public static final XMLNamespace NAMESPACE = XMLNamespace.of("abc");
 
     @Mock
     public SchemaContext mockSchemaContext;
@@ -125,7 +125,7 @@ public class SchemaContextUtilTest {
 
     @Test
     public void findParentModuleIllegalArgumentTest2() {
-        doReturn(SchemaPath.create(true, QName.create("foo", "bar"))).when(schemaNode).getPath();
+        doReturn(QName.create("foo", "bar")).when(schemaNode).getQName();
         assertThrows(NullPointerException.class, () -> SchemaContextUtil.findParentModule(null, schemaNode));
     }
 
@@ -138,7 +138,7 @@ public class SchemaContextUtilTest {
     @Test
     public void findDataSchemaNodeIllegalArgumentTest2() {
         assertThrows(NullPointerException.class, () -> SchemaContextUtil.findDataSchemaNode(null,
-            SchemaPath.create(true, QName.create(URI.create("uri:my-module"), Revision.of("2014-10-07"), "foo"))));
+            SchemaPath.create(true, QName.create(XMLNamespace.of("uri:my-module"), Revision.of("2014-10-07"), "foo"))));
     }
 
     @Test