Add XMLNamespace

[yangtools.git] / yang / yang-data-util / src / test / java / org / opendaylight / yangtools / yang / data / util / codec / IdentityCodecUtilTest.java

diff --git a/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java b/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
index 0212361afab593e141bd82c7e2fe8206cf937eb8..bda6262ba82943de05b3fb5222c9a8e45ae88c8b 100644 (file)
--- a/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
+++ b/yang/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
@@ -9,18 +9,19 @@ package org.opendaylight.yangtools.yang.data.util.codec;
 
 import static com.google.common.base.Preconditions.checkState;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 
-import java.net.URI;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class IdentityCodecUtilTest {
-    private static final QNameModule MODULE = QNameModule.create(URI.create("yangtools846"));
-    private static SchemaContext SCHEMA_CONTEXT;
+    private static final QNameModule MODULE = QNameModule.create(XMLNamespace.of("yangtools846"));
+    private static EffectiveModelContext SCHEMA_CONTEXT;
 
     @BeforeClass
     public static void init() {
@@ -38,37 +39,42 @@ public class IdentityCodecUtilTest {
             IdentityCodecUtilTest::resolvePrefix));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testNonExistent() {
-        IdentityCodecUtil.parseIdentity("yt846:bar", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix);
+        assertThrows(IllegalArgumentException.class,
+            () -> IdentityCodecUtil.parseIdentity("yt846:bar", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testEmptyLocalName() {
-        IdentityCodecUtil.parseIdentity("yt846:", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix);
+        assertThrows(IllegalArgumentException.class,
+            () -> IdentityCodecUtil.parseIdentity("yt846:", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testEmptyString() {
-        IdentityCodecUtil.parseIdentity("", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix);
+        assertThrows(IllegalStateException.class,
+            () -> IdentityCodecUtil.parseIdentity("", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testNoPrefix() {
-        IdentityCodecUtil.parseIdentity("foo", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix);
+        assertThrows(IllegalStateException.class,
+            () -> IdentityCodecUtil.parseIdentity("foo", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testEmptyPrefix() {
-        IdentityCodecUtil.parseIdentity(":foo", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix);
+        assertThrows(IllegalStateException.class,
+            () -> IdentityCodecUtil.parseIdentity(":foo", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testColon() {
-        IdentityCodecUtil.parseIdentity(":", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix);
+        assertThrows(IllegalStateException.class,
+            () -> IdentityCodecUtil.parseIdentity(":", SCHEMA_CONTEXT, IdentityCodecUtilTest::resolvePrefix));
     }
 
-
     private static QNameModule resolvePrefix(final String prefix) {
         // TODO: QNameCodecUtil should deal with some of the malformed stuff here by throwing IAE. We throw an ISE
         //       to discern what is happening.