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 85b6f98dec0fa5752ae3afaaba4329cc52514ec1..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,13 +14,11 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-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.messagebus.spi.EventSource;
 import org.opendaylight.controller.messagebus.spi.EventSourceRegistry;
@@ -31,7 +29,6 @@ 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.common.api.ReadFailedException;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
@@ -39,28 +36,26 @@ 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;
-    RpcProviderService 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
@@ -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);
 
         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<>());
     }