Bump versions to 2.0.0-SNAPSHOT

[netconf.git] / netconf / messagebus-netconf / src / test / java / org / opendaylight / netconf / messagebus / eventsources / netconf / NetconfEventSourceManagerTest.java

diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java
index 2cb740eea2ea91ea8bd4e7ba2571d51caae7a86f..df38c0904dc065b32cb6e73ef2000402c54938c2 100644 (file)
--- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java
+++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java
@@ -14,53 +14,48 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.FluentFuture;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Optional;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.messagebus.spi.EventSource;
 import org.opendaylight.controller.messagebus.spi.EventSourceRegistry;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
+import org.opendaylight.mdsal.dom.api.DOMMountPoint;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
+import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
+import org.opendaylight.mdsal.dom.api.DOMNotificationService;
+import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.Netconf;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.Streams;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-public class NetconfEventSourceManagerTest {
-
-    NetconfEventSourceManager netconfEventSourceManager;
-    ListenerRegistration listenerRegistrationMock;
-    DOMMountPointService domMountPointServiceMock;
-    MountPointService mountPointServiceMock;
-    EventSourceRegistry eventSourceTopologyMock;
-    DataTreeModification<Node> dataTreeModificationMock;
-    RpcProviderRegistry rpcProviderRegistryMock;
-    EventSourceRegistry eventSourceRegistry;
-
-    @BeforeClass
-    public static void initTestClass() throws IllegalAccessException, InstantiationException {
-    }
+@Deprecated(forRemoval = true)
+public class NetconfEventSourceManagerTest extends AbstractCodecTest {
+    private NetconfEventSourceManager netconfEventSourceManager;
+    private ListenerRegistration<?> listenerRegistrationMock;
+    private DOMMountPointService domMountPointServiceMock;
+    private MountPointService mountPointServiceMock;
+    private EventSourceRegistry eventSourceTopologyMock;
+    private DataTreeModification<Node> dataTreeModificationMock;
+    private RpcProviderService rpcProviderRegistryMock;
+    private EventSourceRegistry eventSourceRegistry;
 
     @SuppressWarnings("unchecked")
     @Before
@@ -70,7 +65,7 @@ public class NetconfEventSourceManagerTest {
                 mock(DOMNotificationPublishService.class);
         domMountPointServiceMock = mock(DOMMountPointService.class);
         eventSourceTopologyMock = mock(EventSourceRegistry.class);
-        rpcProviderRegistryMock = mock(RpcProviderRegistry.class);
+        rpcProviderRegistryMock = mock(RpcProviderService.class);
         eventSourceRegistry = mock(EventSourceRegistry.class);
 
         listenerRegistrationMock = mock(ListenerRegistration.class);
@@ -86,17 +81,18 @@ public class NetconfEventSourceManagerTest {
         doReturn(Optional.of(mock(DOMRpcService.class))).when(domMountPointMock).getService(DOMRpcService.class);
         doReturn(Optional.of(mock(DOMNotificationService.class))).when(domMountPointMock)
                 .getService(DOMNotificationService.class);
+        doReturn(Optional.of(mock(DOMSchemaService.class))).when(domMountPointMock).getService(DOMSchemaService.class);
 
-        DOMDataReadOnlyTransaction rtx = mock(DOMDataReadOnlyTransaction.class);
+        DOMDataTreeReadTransaction rtx = mock(DOMDataTreeReadTransaction.class);
         doReturn(rtx).when(mpDataBroker).newReadOnlyTransaction();
-        CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> checkFeature = Futures
-                .immediateCheckedFuture(Optional.of(NetconfTestUtils.getStreamsNode("stream-1")));
+        final FluentFuture<Optional<NormalizedNode<?, ?>>> readStreamFuture =
+                FluentFutures.immediateFluentFuture(Optional.of(NetconfTestUtils.getStreamsNode("stream-1")));
 
         YangInstanceIdentifier pathStream = YangInstanceIdentifier.builder().node(Netconf.QNAME).node(Streams.QNAME)
                 .build();
-        doReturn(checkFeature).when(rtx).read(LogicalDatastoreType.OPERATIONAL, pathStream);
+        doReturn(readStreamFuture).when(rtx).read(LogicalDatastoreType.OPERATIONAL, pathStream);
 
-        netconfEventSourceManager = new NetconfEventSourceManager(dataBrokerMock,
+        netconfEventSourceManager = new NetconfEventSourceManager(dataBrokerMock, SERIALIZER,
                 domNotificationPublishServiceMock, domMountPointServiceMock, eventSourceRegistry);
         netconfEventSourceManager.setStreamMap(new HashMap<>());
     }
@@ -130,8 +126,8 @@ public class NetconfEventSourceManagerTest {
     }
 
     @SuppressWarnings("unchecked")
-    private void onDataChangedTestHelper(boolean create, boolean update, boolean isNetconf, String
-            notificationCapabilityPrefix) throws Exception {
+    private void onDataChangedTestHelper(final boolean create, final boolean update, final boolean isNetconf,
+            final String notificationCapabilityPrefix) throws Exception {
         dataTreeModificationMock = mock(DataTreeModification.class);
         DataObjectModification<Node> mockModification = mock(DataObjectModification.class);
         doReturn(create ? DataObjectModification.ModificationType.WRITE :
@@ -151,7 +147,7 @@ public class NetconfEventSourceManagerTest {
 
         doReturn(node01).when(mockModification).getDataAfter();
 
-        doReturn(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL,
+        doReturn(DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL,
                 NetconfTestUtils.getInstanceIdentifier(node01))).when(dataTreeModificationMock).getRootPath();
     }