Move AbstractDOMDataBroker to mdsal-dom-spi

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

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java
index 319841a4cf0d37ea0efb37c41efa6ec2539a22ad..d496b9e14623a07e9e1727496986e106896cd8a1 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java
@@ -10,6 +10,8 @@ package org.opendaylight.mdsal.dom.broker;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.TEST_CONTAINER;
+import static org.opendaylight.mdsal.dom.broker.TestUtils.getTestRpcImplementation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,12 +19,9 @@ import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
-import org.opendaylight.mdsal.dom.broker.DOMRpcRouter.RpcInvocation;
-import org.opendaylight.mdsal.dom.broker.util.TestModel;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
-public class UnknownDOMRpcRoutingTableEntryTest extends TestUtils {
+public class UnknownDOMRpcRoutingTableEntryTest {
     private static final List<DOMRpcImplementation> TEST_LIST = new ArrayList<>();
 
     @Test
@@ -31,26 +30,27 @@ public class UnknownDOMRpcRoutingTableEntryTest extends TestUtils {
         final List<YangInstanceIdentifier> addList1 = new ArrayList<>();
         final List<YangInstanceIdentifier> addList2 = new ArrayList<>();
         final DOMRpcImplementation testClass = getTestRpcImplementation();
-        final UnknownDOMRpcRoutingTableEntry test = new UnknownDOMRpcRoutingTableEntry(SchemaPath.ROOT, emptyImpls);
+        final UnknownDOMRpcRoutingTableEntry test =
+                new UnknownDOMRpcRoutingTableEntry(TestModel.TEST_QNAME, emptyImpls);
 
         TEST_LIST.add(testClass);
-        emptyImpls.put(YangInstanceIdentifier.EMPTY, TEST_LIST);
+        emptyImpls.put(YangInstanceIdentifier.of(), TEST_LIST);
 
         assertNotNull(test);
         assertNotNull(test.newInstance(emptyImpls));
-        assertNotNull(RpcInvocation.invoke(test, TEST_CONTAINER));
+        assertNotNull(OperationInvocation.invoke(test, TEST_CONTAINER));
         assertNotNull(test.getImplementations());
-        assertEquals(test.getImplementations(YangInstanceIdentifier.EMPTY), TEST_LIST);
-        assertTrue(test.containsContext(YangInstanceIdentifier.EMPTY));
-        assertTrue(test.registeredIdentifiers().contains(YangInstanceIdentifier.EMPTY));
+        assertEquals(test.getImplementations(YangInstanceIdentifier.of()), TEST_LIST);
+        assertTrue(test.containsContext(YangInstanceIdentifier.of()));
+        assertTrue(test.registeredIdentifiers().contains(YangInstanceIdentifier.of()));
 
-        addList1.add(YangInstanceIdentifier.EMPTY);
+        addList1.add(YangInstanceIdentifier.of());
         addList1.add(YangInstanceIdentifier.of(TestModel.TEST_QNAME));
         addList2.add(YangInstanceIdentifier.of(TestModel.TEST2_QNAME));
 
-        final AbstractDOMRpcRoutingTableEntry tst = test.add(testClass, addList1);
-        final AbstractDOMRpcRoutingTableEntry tst1 = tst.add(testClass, addList2);
-        final AbstractDOMRpcRoutingTableEntry tst2 = tst1.remove(testClass, addList1);
+        final AbstractDOMRpcRoutingTableEntry tst = (AbstractDOMRpcRoutingTableEntry) test.add(testClass, addList1);
+        final AbstractDOMRpcRoutingTableEntry tst1 = (AbstractDOMRpcRoutingTableEntry) tst.add(testClass, addList2);
+        final AbstractDOMRpcRoutingTableEntry tst2 = (AbstractDOMRpcRoutingTableEntry) tst1.remove(testClass, addList1);
 
         assertEquals(1, test.getImplementations().size());
         assertEquals(2, tst.getImplementations().size());