Expose a List of changes in DOMDataTreeChangeListener
[mdsal.git] / dom / mdsal-dom-broker / src / test / java / org / opendaylight / mdsal / dom / broker / DOMTransactionChainTest.java
index 28a5539956793b89e8088135da06ca30f6b0eb94..5734ad6cd33f527ca247f5e7356548a6ce6b205e 100644 (file)
@@ -29,7 +29,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
-import org.opendaylight.mdsal.dom.broker.util.TestModel;
 import org.opendaylight.mdsal.dom.spi.store.DOMStore;
 import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -46,8 +45,8 @@ public class DOMTransactionChainTest extends AbstractDatastoreTest {
         final InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG",
                 MoreExecutors.newDirectExecutorService());
 
-        operStore.onGlobalContextUpdated(SCHEMA_CONTEXT);
-        configStore.onGlobalContextUpdated(SCHEMA_CONTEXT);
+        operStore.onModelContextUpdated(SCHEMA_CONTEXT);
+        configStore.onModelContextUpdated(SCHEMA_CONTEXT);
 
         final ImmutableMap<LogicalDatastoreType, DOMStore> stores =
                 ImmutableMap.<LogicalDatastoreType, DOMStore>builder()
@@ -178,9 +177,8 @@ public class DOMTransactionChainTest extends AbstractDatastoreTest {
 
     private static void assertTestContainerExists(final DOMDataTreeReadTransaction readTx)
             throws InterruptedException, ExecutionException {
-        final ListenableFuture<Optional<NormalizedNode<?, ?>>> readFuture =
-                readTx.read(OPERATIONAL, TestModel.TEST_PATH);
-        final Optional<NormalizedNode<?, ?>> readedData = readFuture.get();
+        final ListenableFuture<Optional<NormalizedNode>> readFuture = readTx.read(OPERATIONAL, TestModel.TEST_PATH);
+        final Optional<NormalizedNode> readedData = readFuture.get();
         assertTrue(readedData.isPresent());
     }