Move AbstractDOMDataBroker to mdsal-dom-spi

[mdsal.git] / dom / mdsal-dom-broker / src / test / java / org / opendaylight / mdsal / dom / broker / DOMDataTreeChangeListenerTest.java

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeChangeListenerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeChangeListenerTest.java
index a1b19c1ea3ffe8432b0d06d3a29632f3cad557e9..be762e471d7c63674cb4cf31daffa4f95f9af098 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeChangeListenerTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeChangeListenerTest.java
@@ -19,7 +19,6 @@ import static org.mockito.Mockito.verify;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -28,11 +27,10 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
 import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
 
 public class DOMDataTreeChangeListenerTest extends AbstractDatastoreTest {
 
@@ -45,25 +43,27 @@ public class DOMDataTreeChangeListenerTest extends AbstractDatastoreTest {
     }
 
     @Test
-    public void receiveOnDataInitialEventForEmptyRoot() throws InterruptedException, ExecutionException {
+    public void receiveOnDataInitialEventForEmptyRoot() throws Exception {
         final DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class);
         doNothing().when(listener).onInitialData();
 
-        domStore.registerTreeChangeListener(YangInstanceIdentifier.empty(), listener);
+        domStore.registerTreeChangeListener(YangInstanceIdentifier.of(), listener);
         verify(listener, timeout(1000)).onInitialData();
     }
 
     @Test
-    public void receiveOnDataInitialEventForNonExistingData() throws InterruptedException, ExecutionException {
+    public void receiveOnDataInitialEventForNonExistingData() throws Exception {
         final DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class);
-        final ArgumentCaptor<List> candidateCapture = ArgumentCaptor.forClass(List.class);
+        final var candidateCapture = ArgumentCaptor.forClass(List.class);
         doNothing().when(listener).onInitialData();
         doNothing().when(listener).onDataTreeChanged(any());
 
         domStore.registerTreeChangeListener(TestModel.TEST_PATH, listener);
         verify(listener, times(1)).onInitialData();
 
-        final NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+        final var testNode = ImmutableNodes.newContainerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME))
+            .build();
         DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction();
         assertNotNull(writeTx);
         writeTx.write(TestModel.TEST_PATH, testNode);
@@ -77,12 +77,14 @@ public class DOMDataTreeChangeListenerTest extends AbstractDatastoreTest {
     }
 
     @Test
-    public void receiveOnDataTreeChangedEventForPreExistingEmptyData() throws InterruptedException, ExecutionException {
+    public void receiveOnDataTreeChangedEventForPreExistingEmptyData() throws Exception {
         final DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class);
         final ArgumentCaptor<List> candidateCapture = ArgumentCaptor.forClass(List.class);
         doNothing().when(listener).onDataTreeChanged(any());
 
-        final NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+        final var testNode = ImmutableNodes.newContainerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME))
+            .build();
 
         DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction();
         assertNotNull(writeTx);
@@ -99,16 +101,18 @@ public class DOMDataTreeChangeListenerTest extends AbstractDatastoreTest {
     }
 
     @Test
-    public void receiveOnDataTreeChangeEventForPreExistingData() throws InterruptedException, ExecutionException {
+    public void receiveOnDataTreeChangeEventForPreExistingData() throws Exception {
         final DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class);
         final ArgumentCaptor<List> candidateCapture = ArgumentCaptor.forClass(List.class);
         doNothing().when(listener).onDataTreeChanged(any());
 
-        final ContainerNode testNode = ImmutableContainerNodeBuilder.create()
-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))
-                .addChild(ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME)
-                        .addChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME,
-                                TestModel.ID_QNAME, 1)).build()).build();
+        final ContainerNode testNode = ImmutableNodes.newContainerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME))
+            .addChild(ImmutableNodes.newSystemMapBuilder()
+                .withNodeIdentifier(new NodeIdentifier(TestModel.OUTER_LIST_QNAME))
+                .addChild(TestUtils.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1))
+                .build())
+            .build();
         DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction();
         assertNotNull(writeTx);
         writeTx.write(TestModel.TEST_PATH, testNode);