Adjust to yangtools-2.0.0/odlparent-3.0.0 changes

[netconf.git] / netconf / netconf-topology-singleton / src / test / java / org / opendaylight / netconf / topology / singleton / impl / tx / ReadWriteTransactionTest.java

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java
index ccf2d59660ed1470c4121f9efd20af71ae2aacf7..441a4caaa3a708432233650c051625ac80843a60 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java
@@ -115,8 +115,8 @@ public class ReadWriteTransactionTest {
                 new ProxyDOMDataBroker(system, remoteDeviceId, masterRef, Timeout.apply(5, TimeUnit.SECONDS));
         initializeDataTest();
         testNode = ImmutableContainerNodeBuilder.create()
-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("TestQname")))
-                .withChild(ImmutableNodes.leafNode(QName.create("NodeQname"), "foo")).build();
+                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("", "TestQname")))
+                .withChild(ImmutableNodes.leafNode(QName.create("", "NodeQname"), "foo")).build();
         instanceIdentifier = YangInstanceIdentifier.EMPTY;
         storeType = LogicalDatastoreType.CONFIGURATION;
     }
@@ -151,15 +151,12 @@ public class ReadWriteTransactionTest {
 
     @Test
     public void testDelete() throws Exception {
-        final YangInstanceIdentifier instanceIdentifier = YangInstanceIdentifier.EMPTY;
-        final LogicalDatastoreType storeType = LogicalDatastoreType.CONFIGURATION;
-
         // Test of invoking delete on master through slave proxy
         final DOMDataWriteTransaction wTx = slaveDataBroker.newReadWriteTransaction();
-        wTx.delete(storeType, instanceIdentifier);
+        wTx.delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
         wTx.cancel();
 
-        verify(readWriteTx, timeout(2000)).delete(storeType, instanceIdentifier);
+        verify(readWriteTx, timeout(2000)).delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
     }
 
     @Test
@@ -240,8 +237,8 @@ public class ReadWriteTransactionTest {
     public void testRead() throws Exception {
         // Message: NormalizedNodeMessage
         final NormalizedNode<?, ?> outputNode = ImmutableContainerNodeBuilder.create()
-                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("TestQname")))
-                .withChild(ImmutableNodes.leafNode(QName.create("NodeQname"), "foo")).build();
+                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("", "TestQname")))
+                .withChild(ImmutableNodes.leafNode(QName.create("", "NodeQname"), "foo")).build();
         final CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> resultNormalizedNodeMessage =
                 Futures.immediateCheckedFuture(Optional.of(outputNode));
         doReturn(resultNormalizedNodeMessage).when(readWriteTx).read(storeType, instanceIdentifier);