Bump versions to 2.0.0-SNAPSHOT

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

diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java
index 2bf354b2c99758bf75baaac0639cd8016f6c138d..436245400a343752e9ecd801d4d0e198a080d02a 100644 (file)
--- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java
+++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java
@@ -5,25 +5,29 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.messagebus.eventsources.netconf;
 
 import static org.hamcrest.CoreMatchers.hasItems;
-import static org.mockito.Matchers.any;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateNullFluentFuture;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.Futures;
-import java.util.Date;
+import java.time.Instant;
+import java.util.Optional;
 import java.util.Set;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationListener;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
+import org.opendaylight.mdsal.dom.api.DOMNotificationService;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.eventaggregator.rev141202.TopicId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.Stream;
@@ -33,10 +37,13 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 
+@Deprecated(forRemoval = true)
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class StreamNotificationTopicRegistrationTest {
 
     private static final String STREAM_NAME = "stream-1";
-    private static final String PREFIX = ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH.getLastComponent().getNamespace().toString();
+    private static final String PREFIX = ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH
+            .lastNodeIdentifier().getNamespace().toString();
 
     @Mock
     private NetconfEventSource source;
@@ -52,17 +59,17 @@ public class StreamNotificationTopicRegistrationTest {
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
         Node node = new NodeBuilder().setNodeId(NodeId.getDefaultInstance("node-id")).build();
         when(mount.getNode()).thenReturn(node);
-        when(mount.registerNotificationListener(source, ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH))
+        when(mount.registerNotificationListener(source,
+                ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH.asSchemaPath()))
                 .thenReturn(listenerRegistration);
-        when(mount.invokeCreateSubscription(any(), any())).thenReturn(Futures.immediateCheckedFuture(null));
-        when(mount.invokeCreateSubscription(any())).thenReturn(Futures.immediateCheckedFuture(null));
+        doReturn(immediateNullFluentFuture()).when(mount).invokeCreateSubscription(any(), any());
+        doReturn(immediateNullFluentFuture()).when(mount).invokeCreateSubscription(any());
 
         when(source.getMount()).thenReturn(mount);
-        stream = new StreamBuilder().setName(StreamNameType.getDefaultInstance(STREAM_NAME)).setReplaySupport(true).build();
+        stream = new StreamBuilder().setName(StreamNameType.getDefaultInstance(STREAM_NAME)).setReplaySupport(true)
+                .build();
 
         registration = new StreamNotificationTopicRegistration(stream, PREFIX, source);
     }
@@ -70,7 +77,7 @@ public class StreamNotificationTopicRegistrationTest {
     @Test
     public void testActivateNotificationSource() throws Exception {
         registration.activateNotificationSource();
-        Assert.assertTrue(registration.isActive());
+        assertTrue(registration.isActive());
         verify(mount).invokeCreateSubscription(stream);
 
     }
@@ -80,18 +87,18 @@ public class StreamNotificationTopicRegistrationTest {
         registration.setActive(true);
         registration.reActivateNotificationSource();
 
-        Assert.assertTrue(registration.isActive());
-        verify(mount).invokeCreateSubscription(stream, Optional.absent());
+        assertTrue(registration.isActive());
+        verify(mount).invokeCreateSubscription(stream, Optional.empty());
     }
 
     @Test
     public void testReActivateNotificationSourceWithReplay() throws Exception {
-        final Date lastEventTime = new Date();
+        final Instant lastEventTime = Instant.now();
         registration.setActive(true);
         registration.setLastEventTime(lastEventTime);
         registration.reActivateNotificationSource();
 
-        Assert.assertTrue(registration.isActive());
+        assertTrue(registration.isActive());
         verify(mount).invokeCreateSubscription(stream, Optional.of(lastEventTime));
     }
 
@@ -99,7 +106,7 @@ public class StreamNotificationTopicRegistrationTest {
     public void testClose() throws Exception {
         registration.setActive(true);
         registration.close();
-        Assert.assertFalse(registration.isActive());
+        assertFalse(registration.isActive());
     }
 
     @Test
@@ -107,20 +114,23 @@ public class StreamNotificationTopicRegistrationTest {
         final TopicId topic1 = registerTopic("topic1");
         final TopicId topic2 = registerTopic("topic2");
         final TopicId topic3 = registerTopic("topic3");
-        final Set<TopicId> notificationTopicIds = registration.getTopicsForNotification(ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH);
-        Assert.assertNotNull(notificationTopicIds);
-        Assert.assertThat(notificationTopicIds, hasItems(topic1, topic2, topic3));
+        final Set<TopicId> notificationTopicIds = registration.getTopicsForNotification(
+            ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH.asSchemaPath());
+        assertNotNull(notificationTopicIds);
+        assertThat(notificationTopicIds, hasItems(topic1, topic2, topic3));
 
         registration.unRegisterNotificationTopic(topic3);
-        final Set<TopicId> afterUnregister = registration.getTopicsForNotification(ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH);
-        Assert.assertNotNull(afterUnregister);
-        Assert.assertThat(afterUnregister, hasItems(topic1, topic2));
-        Assert.assertFalse(afterUnregister.contains(topic3));
+        final Set<TopicId> afterUnregister = registration.getTopicsForNotification(
+            ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH.asSchemaPath());
+        assertNotNull(afterUnregister);
+        assertThat(afterUnregister, hasItems(topic1, topic2));
+        assertFalse(afterUnregister.contains(topic3));
     }
 
-    private TopicId registerTopic(String value) {
+    private TopicId registerTopic(final String value) {
         final TopicId topic = TopicId.getDefaultInstance(value);
-        registration.registerNotificationTopic(ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH, topic);
+        registration.registerNotificationTopic(
+            ConnectionNotificationTopicRegistration.EVENT_SOURCE_STATUS_PATH.asSchemaPath(), topic);
         return topic;
     }