Further cleanups of code

[yangtools.git] / yang / yang-common / src / test / java / org / opendaylight / yangtools / yang / common / QNameTest.java

diff --git a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java
index 410bca2b82090c6b32c4ab1c37092489c345d5e5..59c91c939bbcb4a1d3abb85eada17cffcb7910ff 100644 (file)
--- a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java
+++ b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java
@@ -7,11 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.common;
 
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import java.net.URI;
-
-import static org.junit.Assert.*;
+import java.util.Date;
+import org.junit.Test;
 
 public class QNameTest {
     private final String namespace = "urn:foo", revision = "2013-12-24", localName = "bar";
@@ -80,13 +82,13 @@ public class QNameTest {
         assertTrue(b.compareTo(a) > 0);
 
         // compare with 1 null namespace
-        a = new QName(null, QName.parseRevision(revision), A);
-        b = new QName(URI.create(A), QName.parseRevision(revision), A);
+        a = QName.create(null, QName.parseRevision(revision), A);
+        b = QName.create(URI.create(A), QName.parseRevision(revision), A);
         assertTrue(a.compareTo(b) < 0);
         assertTrue(b.compareTo(a) > 0);
 
         // compare with both null namespace
-        b = new QName(null, QName.parseRevision(revision), A);
+        b = QName.create(null, QName.parseRevision(revision), A);
         assertTrue(a.compareTo(b) == 0);
         assertTrue(b.compareTo(a) == 0);
 
@@ -97,24 +99,42 @@ public class QNameTest {
         assertTrue(b.compareTo(a) > 0);
 
         // compare with 1 null revision
-        a = new QName(URI.create(A), null, A);
-        b = new QName(URI.create(A), QName.parseRevision(revision), A);
+        a = QName.create(URI.create(A), null, A);
+        b = QName.create(URI.create(A), QName.parseRevision(revision), A);
         assertTrue(a.compareTo(b) < 0);
         assertTrue(b.compareTo(a) > 0);
 
         // compare with both null revision
-        b = new QName(URI.create(A), null, A);
+        b = QName.create(URI.create(A), null, A);
         assertTrue(a.compareTo(b) == 0);
         assertTrue(b.compareTo(a) == 0);
     }
 
-    private void assertLocalNameFails(String localName) {
+    @Test
+    public void testQName() {
+        final QName qName = QName.create(namespace, revision, localName);
+        final QName qName1 = QName.create(namespace, localName);
+        final QName qName2 = QName.create(qName1, localName);
+        assertEquals(qName1, qName.withoutRevision());
+        assertEquals(qName1, qName2);
+        assertTrue(qName.isEqualWithoutRevision(qName1));
+        assertNotNull(QName.formattedRevision(new Date()));
+        assertNotNull(qName.hashCode());
+        assertEquals(qName, qName.intern());
+    }
+
+    @Test
+    public void testQNameModule() {
+        final QNameModule qNameModule = QNameModule.create(ns, new Date());
+        assertNotNull(qNameModule.toString());
+        assertNotNull(qNameModule.getRevisionNamespace());
+    }
+
+    private static void assertLocalNameFails(final String localName) {
         try {
             new QName((URI)null, localName);
             fail("Local name should fail:" + localName);
         } catch (IllegalArgumentException e) {
-
         }
     }
-
-}
+}
\ No newline at end of file