Merge "Migrate netconf to mockito ArgumentMatchers"

[netconf.git] / netconf / mdsal-netconf-notification / src / test / java / org / opendaylight / controller / config / yang / netconf / mdsal / notification / NotificationToMdsalWriterTest.java

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java
index 6084d92cca0a62952a1b2b9bbc19e06668f015d4..d9682163b9e50d90e7a867d109bebe65732d7e10 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java
@@ -5,17 +5,16 @@
  * 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.controller.config.yang.netconf.mdsal.notification;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture;
 
-import com.google.common.util.concurrent.Futures;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -23,7 +22,6 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.netconf.notifications.NetconfNotificationCollector;
 import org.opendaylight.netconf.notifications.NotificationRegistration;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType;
@@ -48,33 +46,32 @@ public class NotificationToMdsalWriterTest {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         final NetconfNotificationCollector notificationCollector = mock(NetconfNotificationCollector.class);
-        final BindingAwareBroker.ProviderContext session = mock(BindingAwareBroker.ProviderContext.class);
 
         doReturn(notificationRegistration).when(notificationCollector).registerStreamListener(any(
                 NetconfNotificationCollector.NetconfNotificationStreamListener.class));
-        doReturn(dataBroker).when(session).getSALService(DataBroker.class);
 
         WriteTransaction tx = mock(WriteTransaction.class);
-        doNothing().when(tx).merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)
-                , any(DataObject.class), anyBoolean());
+        doNothing().when(tx).merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class),
+                any(DataObject.class), anyBoolean());
         doNothing().when(tx).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class));
-        doReturn(Futures.immediateCheckedFuture(null)).when(tx).submit();
+        doReturn(emptyFluentFuture()).when(tx).commit();
         doReturn(tx).when(dataBroker).newWriteOnlyTransaction();
 
-        writer = new NotificationToMdsalWriter(notificationCollector);
-        writer.onSessionInitiated(session);
+        writer = new NotificationToMdsalWriter(notificationCollector, dataBroker);
+        writer.start();
     }
 
     @Test
     public void testStreamRegisteration() {
         final StreamNameType testStreamName = new StreamNameType("TESTSTREAM");
         final Stream testStream = new StreamBuilder().setName(testStreamName).build();
-        final InstanceIdentifier streamIdentifier = InstanceIdentifier.create(Netconf.class).child(Streams.class)
-                .builder().child(Stream.class, testStream.getKey()).build();
+        final InstanceIdentifier<Stream> streamIdentifier = InstanceIdentifier.create(Netconf.class)
+                .child(Streams.class).child(Stream.class, testStream.key());
 
         writer.onStreamRegistered(testStream);
 
-        verify(dataBroker.newWriteOnlyTransaction()).merge(LogicalDatastoreType.OPERATIONAL, streamIdentifier, testStream, true);
+        verify(dataBroker.newWriteOnlyTransaction()).merge(LogicalDatastoreType.OPERATIONAL, streamIdentifier,
+                testStream, true);
 
         writer.onStreamUnregistered(testStreamName);
 
@@ -82,10 +79,10 @@ public class NotificationToMdsalWriterTest {
     }
 
     @Test
-    public void testClose(){
+    public void testClose() {
         doNothing().when(notificationRegistration).close();
 
-        final InstanceIdentifier streamIdentifier = InstanceIdentifier.create(Netconf.class);
+        final InstanceIdentifier<Netconf> streamIdentifier = InstanceIdentifier.create(Netconf.class);
 
         writer.close();