Bump upstream versions

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

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java
index b1bc972576ec55aebf39b1acd237e07006894987..337552101d0e0c2adb9223714dde621c2b0b2bd4 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java
@@ -19,10 +19,10 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.Test;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 import org.opendaylight.netconf.topology.singleton.messages.transactions.DeleteRequest;
 import org.opendaylight.netconf.topology.singleton.messages.transactions.NewReadTransactionRequest;
@@ -48,42 +48,42 @@ public class ProxyDOMDataBrokerTest {
 
     @AfterClass
     public static void staticTearDown() {
-        TestKit.shutdownActorSystem(system, Boolean.TRUE);
+        TestKit.shutdownActorSystem(system, true);
     }
 
     @Test
     public void testNewReadOnlyTransaction() {
-        final DOMDataReadOnlyTransaction tx = proxy.newReadOnlyTransaction();
+        final DOMDataTreeReadTransaction tx = proxy.newReadOnlyTransaction();
         masterActor.expectMsgClass(NewReadTransactionRequest.class);
         masterActor.reply(new Success(masterActor.ref()));
 
         assertEquals(DEVICE_ID, tx.getIdentifier());
 
-        tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
+        tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty());
         masterActor.expectMsgClass(ReadRequest.class);
     }
 
     @Test
     public void testNewWriteOnlyTransaction() {
-        final DOMDataWriteTransaction tx = proxy.newWriteOnlyTransaction();
+        final DOMDataTreeWriteTransaction tx = proxy.newWriteOnlyTransaction();
         masterActor.expectMsgClass(NewWriteTransactionRequest.class);
         masterActor.reply(new Success(masterActor.ref()));
 
         assertEquals(DEVICE_ID, tx.getIdentifier());
 
-        tx.delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
+        tx.delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty());
         masterActor.expectMsgClass(DeleteRequest.class);
     }
 
     @Test
     public void testNewReadWriteTransaction() {
-        final DOMDataReadWriteTransaction tx = proxy.newReadWriteTransaction();
+        final DOMDataTreeReadWriteTransaction tx = proxy.newReadWriteTransaction();
         masterActor.expectMsgClass(NewReadWriteTransactionRequest.class);
         masterActor.reply(new Success(masterActor.ref()));
 
         assertEquals(DEVICE_ID, tx.getIdentifier());
 
-        tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
+        tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty());
         masterActor.expectMsgClass(ReadRequest.class);
     }
 
@@ -94,6 +94,6 @@ public class ProxyDOMDataBrokerTest {
 
     @Test
     public void testGetSupportedExtensions() {
-        assertTrue(proxy.getSupportedExtensions().isEmpty());
+        assertTrue(proxy.getExtensions().isEmpty());
     }
 }