Sharpen netconf-server methods used in tests

We have a couple of warnings around nulls from get* methods. Switch to
nonnull*/require* to make the testing intent clearer.

Change-Id: Ie6a46cecdcbfbbb1a6a02014cf34b5aa7022d59c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java
index 8484d71aff451513863eadce9d2ab5db250c0c98..a137cbb7005529120813e6cdd25b67d8a075f4a8 100644 (file)
--- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java
@@ -107,7 +107,7 @@ public class NetconfCapabilityMonitoringServiceTest {
         monitoringService.onCapabilitiesChanged(capabilities, Set.of());
         monitoringService.setNotificationPublisher(notificationPublisher);
         monitoringService.registerListener(listener);
-        capabilitiesSize = monitoringService.getCapabilities().getCapability().size();
+        capabilitiesSize = monitoringService.getCapabilities().requireCapability().size();
     }
 
     @Test
@@ -123,7 +123,7 @@ public class NetconfCapabilityMonitoringServiceTest {
     @Test
     public void testGetSchemas() {
         Schemas schemas = monitoringService.getSchemas();
-        Schema schema = schemas.getSchema().values().iterator().next();
+        Schema schema = schemas.nonnullSchema().values().iterator().next();
         assertEquals(TEST_MODULE_NAMESPACE, schema.getNamespace());
         assertEquals(TEST_MODULE_NAME, schema.getIdentifier());
         assertEquals(TEST_MODULE_REV, schema.getVersion());
@@ -162,7 +162,7 @@ public class NetconfCapabilityMonitoringServiceTest {
 
     @Test
     public void testClose() {
-        assertEquals(6, monitoringService.getCapabilities().getCapability().size());
+        assertEquals(6, monitoringService.getCapabilities().requireCapability().size());
         monitoringService.close();
         assertEquals(Set.of(), monitoringService.getCapabilities().getCapability());
     }
@@ -186,9 +186,9 @@ public class NetconfCapabilityMonitoringServiceTest {
 
         //verify listener calls
         final List<Capabilities> listenerValues = monitoringListenerCaptor.getAllValues();
-        final Set<Uri> afterRegisterState = listenerValues.get(0).getCapability();
-        final Set<Uri> afterAddState = listenerValues.get(1).getCapability();
-        final Set<Uri> afterRemoveState = listenerValues.get(2).getCapability();
+        final Set<Uri> afterRegisterState = listenerValues.get(0).requireCapability();
+        final Set<Uri> afterAddState = listenerValues.get(1).requireCapability();
+        final Set<Uri> afterRemoveState = listenerValues.get(2).requireCapability();
 
         assertEquals(capabilitiesSize, afterRegisterState.size());
         assertEquals(capabilitiesSize + 1, afterAddState.size());

diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java
index 54184ff57f45bebf5a1ac0b5e4727dd98adc539f..4889170edae33915fa865176b6b73ce3bfbd8877 100644 (file)
--- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java
@@ -91,7 +91,7 @@ public class NetconfSessionMonitoringServiceTest {
     @Test
     public void testClose() {
         monitoringService.onSessionUp(sessionMock1);
-        assertEquals(1, monitoringService.getSessions().getSession().size());
+        assertEquals(1, monitoringService.getSessions().nonnullSession().size());
         monitoringService.close();
         assertNull(monitoringService.getSessions().getSession());
     }