Bump upstreams

[netconf.git] / plugins / netconf-server-mdsal / src / test / java / org / opendaylight / netconf / server / mdsal / notifications / YangLibraryNotificationProducerTestRFC8525.java

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/notifications/YangLibraryNotificationProducerTestRFC8525.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/notifications/YangLibraryNotificationProducerTestRFC8525.java
index 2bb2efd19d1c3a9d499f07f13aa5cac81c2e79e1..d7adab0eca751d255855b03d9e630be8988eeadb 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/notifications/YangLibraryNotificationProducerTestRFC8525.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/notifications/YangLibraryNotificationProducerTestRFC8525.java
@@ -10,25 +10,20 @@ package org.opendaylight.netconf.server.mdsal.notifications;
 import static org.mockito.ArgumentMatchers.any;
 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 java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.DataObjectModification;
-import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.netconf.server.api.notifications.NetconfNotificationCollector;
 import org.opendaylight.netconf.server.api.notifications.YangLibraryPublisherRegistration;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.YangLibrary;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.YangLibraryBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.YangLibraryUpdate;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.YangLibraryUpdateBuilder;
+import org.opendaylight.yangtools.concepts.Registration;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class YangLibraryNotificationProducerTestRFC8525 {
@@ -38,13 +33,16 @@ public class YangLibraryNotificationProducerTestRFC8525 {
     private NetconfNotificationCollector netconfNotificationCollector;
     @Mock
     private DataBroker dataBroker;
+    @Mock
+    private Registration registration;
 
     private YangLibraryNotificationProducerRFC8525 yangLibraryNotificationProducer;
 
     @Before
     public void setUp() {
-        doNothing().when(yangLibraryPublisherRegistration).onYangLibraryUpdate(any(YangLibraryUpdate.class));
+        doNothing().when(yangLibraryPublisherRegistration).onYangLibraryUpdate(any());
         doReturn(yangLibraryPublisherRegistration).when(netconfNotificationCollector).registerYangLibraryPublisher();
+        doReturn(registration).when(dataBroker).registerDataListener(any(), any());
 
         yangLibraryNotificationProducer = new YangLibraryNotificationProducerRFC8525(netconfNotificationCollector,
                 dataBroker);
@@ -53,16 +51,10 @@ public class YangLibraryNotificationProducerTestRFC8525 {
     @Test
     public void testOnDataTreeChanged() {
         final String contentId = "1";
-        YangLibrary yangLibraryAfter = new YangLibraryBuilder().setContentId(contentId).build();
 
-        final DataTreeModification<YangLibrary> treeChange = mock(DataTreeModification.class);
-        final DataObjectModification<Capabilities> objectChange = mock(DataObjectModification.class);
-        doReturn(objectChange).when(treeChange).getRootNode();
-        doReturn(yangLibraryAfter).when(objectChange).getDataAfter();
+        yangLibraryNotificationProducer.dataChangedTo(new YangLibraryBuilder().setContentId(contentId).build());
 
         YangLibraryUpdate yangLibraryUpdate = new YangLibraryUpdateBuilder().setContentId(contentId).build();
-        yangLibraryNotificationProducer.onDataTreeChanged(List.of(treeChange));
-
         verify(yangLibraryPublisherRegistration).onYangLibraryUpdate(yangLibraryUpdate);
     }
 }
\ No newline at end of file