Migrate users of YangInstanceIdentifier.{create,empty}()

[mdsal.git] / dom / mdsal-dom-api / src / test / java / org / opendaylight / mdsal / dom / api / DOMDataTreeIdentifierTest.java

diff --git a/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java b/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java
index 2e3696e367c7dcec6b44b31f04309ae02dc7270b..15d010f8d01576e2209586df8870d4d4210680a3 100644 (file)
--- a/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java
+++ b/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java
@@ -13,11 +13,11 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.net.URI;
 import org.junit.Test;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 public class DOMDataTreeIdentifierTest {
@@ -25,12 +25,12 @@ public class DOMDataTreeIdentifierTest {
     private static final String TEST_LISTS = "test-lists";
     private static final String COMPARE_FIRST_LISTS = "A-test-lists";
     private static final String COMPARE_SECOND_LISTS = "B-test-lists";
-    private static final QNameModule TEST_MODULE = QNameModule.create(URI.create(
+    private static final QNameModule TEST_MODULE = QNameModule.create(XMLNamespace.of(
             "urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:store"));
-    private static final YangInstanceIdentifier REF_YII_IID = YangInstanceIdentifier.create(
-            new YangInstanceIdentifier.NodeIdentifier(QName.create(TEST_MODULE, REF_LISTS)));
-    private static final YangInstanceIdentifier TEST_YII_IID = YangInstanceIdentifier.create(
-            new YangInstanceIdentifier.NodeIdentifier(QName.create(TEST_MODULE, TEST_LISTS)));
+    private static final YangInstanceIdentifier REF_YII_IID = YangInstanceIdentifier.of(
+            QName.create(TEST_MODULE, REF_LISTS));
+    private static final YangInstanceIdentifier TEST_YII_IID = YangInstanceIdentifier.of(
+            QName.create(TEST_MODULE, TEST_LISTS));
     private static final DOMDataTreeIdentifier REF_TREE = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
             REF_YII_IID);
     private static final DOMDataTreeIdentifier
@@ -41,16 +41,6 @@ public class DOMDataTreeIdentifierTest {
         assertNotNull("Instantiation", new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, REF_YII_IID));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void firstArgumentNullTest() throws Exception {
-        new DOMDataTreeIdentifier(null, REF_YII_IID);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void secondArgumentNullTest() throws Exception {
-        new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, null);
-    }
-
     @Test
     public void hashCodeTest() {
         assertEquals("hashCode", REF_TREE.hashCode(), new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
@@ -72,28 +62,24 @@ public class DOMDataTreeIdentifierTest {
 
     @Test
     public void compareToTest() {
-        final YangInstanceIdentifier compareFirstIid = YangInstanceIdentifier.create(
-                new YangInstanceIdentifier.NodeIdentifier(QName.create(TEST_MODULE, COMPARE_FIRST_LISTS)));
-        final YangInstanceIdentifier compareSecondIid = YangInstanceIdentifier.create(
-                new YangInstanceIdentifier.NodeIdentifier(QName.create(TEST_MODULE, COMPARE_SECOND_LISTS)));
+        final var compareFirstIid = YangInstanceIdentifier.of(QName.create(TEST_MODULE, COMPARE_FIRST_LISTS));
+        final var compareSecondIid = YangInstanceIdentifier.of(QName.create(TEST_MODULE, COMPARE_SECOND_LISTS));
 
         assertEquals("Compare same to same", REF_TREE.compareTo(
-                new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
+            new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
                 REF_YII_IID)), 0);
         assertNotEquals("Compare same to same with different datastore", REF_TREE.compareTo(new DOMDataTreeIdentifier(
-                LogicalDatastoreType.CONFIGURATION, REF_YII_IID)), 0);
+            LogicalDatastoreType.CONFIGURATION, REF_YII_IID)), 0);
         assertEquals("Compare same to same with different datastore",
-                new DOMDataTreeIdentifier(
-                        LogicalDatastoreType.OPERATIONAL,
-                        YangInstanceIdentifier.create(
-                                YangInstanceIdentifier.NodeIdentifier.create(QName.create(TEST_MODULE, REF_LISTS)),
-                                YangInstanceIdentifier.NodeIdentifier.create(QName.create(TEST_MODULE, TEST_LISTS))))
-                .compareTo(REF_TREE), 1);
+            new DOMDataTreeIdentifier(
+                LogicalDatastoreType.OPERATIONAL,
+                YangInstanceIdentifier.of(QName.create(TEST_MODULE, REF_LISTS), QName.create(TEST_MODULE, TEST_LISTS)))
+            .compareTo(REF_TREE), 1);
         assertTrue("Compare first to second", new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
-                compareFirstIid).compareTo(new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
+            compareFirstIid).compareTo(new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
                 compareSecondIid)) < 0);
         assertTrue("Compare second to first", new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
-                compareSecondIid).compareTo(new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
+            compareSecondIid).compareTo(new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
                 compareFirstIid)) > 0);
     }