X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fimpl%2Fosgi%2FNetconfCapabilityMonitoringServiceTest.java;h=54d3cb3b7c7246f75dae6baef7194779d78d457b;hb=1aaec97aa24f5dfe62fd3e6523e651db883ab51f;hp=f71cac6233cccd62ffbfd7e5d0a7636cdef5138b;hpb=ec860b9f946515a6a16659b23eb7dec1a8d89624;p=netconf.git diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java index f71cac6233..54d3cb3b7c 100644 --- a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java +++ b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java @@ -17,20 +17,18 @@ import com.google.common.base.Optional; import java.net.URI; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.config.util.capability.BasicCapability; -import org.opendaylight.controller.config.util.capability.Capability; -import org.opendaylight.controller.config.util.capability.YangModuleCapability; +import org.opendaylight.netconf.api.capability.BasicCapability; +import org.opendaylight.netconf.api.capability.Capability; +import org.opendaylight.netconf.api.capability.YangModuleCapability; import org.opendaylight.netconf.api.monitoring.NetconfManagementSession; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; @@ -44,7 +42,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.SessionBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange; -import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; +import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; public class NetconfCapabilityMonitoringServiceTest { @@ -53,10 +51,10 @@ public class NetconfCapabilityMonitoringServiceTest { private static final String TEST_MODULE_CONTENT2 = "content2"; private static final String TEST_MODULE_REV = "1970-01-01"; private static final String TEST_MODULE_REV2 = "1970-01-02"; - private static final Uri TEST_MODULE_NAMESPACE = new Uri("testModuleNamespace"); + private static final Uri TEST_MODULE_NAMESPACE = new Uri("testModuleNamespace"); private static final String TEST_MODULE_NAME = "testModule"; - private static Date TEST_MODULE_DATE; - private static Date TEST_MODULE_DATE2; + private static final Revision TEST_MODULE_DATE = Revision.of(TEST_MODULE_REV); + private static final Revision TEST_MODULE_DATE2 = Revision.of(TEST_MODULE_REV2); private YangModuleCapability moduleCapability1; private YangModuleCapability moduleCapability2; @@ -67,7 +65,7 @@ public class NetconfCapabilityMonitoringServiceTest { .build(); private int capabilitiesSize; - private final Set CAPABILITIES = new HashSet<>(); + private final Set capabilities = new HashSet<>(); @Mock private Module moduleMock; @@ -84,34 +82,30 @@ public class NetconfCapabilityMonitoringServiceTest { private NetconfCapabilityMonitoringService monitoringService; - @BeforeClass - public static void suiteSetUp() throws Exception { - TEST_MODULE_DATE = SimpleDateFormatUtil.getRevisionFormat().parse(TEST_MODULE_REV); - TEST_MODULE_DATE2= SimpleDateFormatUtil.getRevisionFormat().parse(TEST_MODULE_REV2); - } - @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); doReturn(new URI(TEST_MODULE_NAMESPACE.getValue())).when(moduleMock).getNamespace(); doReturn(TEST_MODULE_NAME).when(moduleMock).getName(); - doReturn(TEST_MODULE_DATE).when(moduleMock).getRevision(); + doReturn(java.util.Optional.of(TEST_MODULE_DATE)).when(moduleMock).getRevision(); moduleCapability1 = new YangModuleCapability(moduleMock, TEST_MODULE_CONTENT); - CAPABILITIES.add(moduleCapability1); + capabilities.add(moduleCapability1); doReturn(new URI(TEST_MODULE_NAMESPACE.getValue())).when(moduleMock2).getNamespace(); doReturn(TEST_MODULE_NAME).when(moduleMock2).getName(); - doReturn(TEST_MODULE_DATE2).when(moduleMock2).getRevision(); + doReturn(java.util.Optional.of(TEST_MODULE_DATE2)).when(moduleMock2).getRevision(); moduleCapability2 = new YangModuleCapability(moduleMock2, TEST_MODULE_CONTENT2); - CAPABILITIES.add(new BasicCapability("urn:ietf:params:netconf:base:1.0")); - CAPABILITIES.add(new BasicCapability("urn:ietf:params:netconf:base:1.1")); - CAPABILITIES.add(new BasicCapability("urn:ietf:params:xml:ns:yang:ietf-inet-types?module=ietf-inet-types&revision=2010-09-24")); + capabilities.add(new BasicCapability("urn:ietf:params:netconf:base:1.0")); + capabilities.add(new BasicCapability("urn:ietf:params:netconf:base:1.1")); + capabilities.add(new BasicCapability("urn:ietf:params:xml:ns:yang:ietf-inet-types?module=ietf-inet-types&" + + "revision=2010-09-24")); - doReturn(CAPABILITIES).when(operationServiceFactoryMock).getCapabilities(); - doReturn(null).when(operationServiceFactoryMock).registerCapabilityListener(any(NetconfCapabilityMonitoringService.class)); + doReturn(capabilities).when(operationServiceFactoryMock).getCapabilities(); + doReturn(null).when(operationServiceFactoryMock) + .registerCapabilityListener(any(NetconfCapabilityMonitoringService.class)); doReturn(SESSION).when(sessionMock).toManagementSession(); doNothing().when(listener).onCapabilitiesChanged(any()); @@ -122,7 +116,7 @@ public class NetconfCapabilityMonitoringServiceTest { doNothing().when(notificationPublisher).onSessionEnded(any()); monitoringService = new NetconfCapabilityMonitoringService(operationServiceFactoryMock); - monitoringService.onCapabilitiesChanged(CAPABILITIES, Collections.emptySet()); + monitoringService.onCapabilitiesChanged(capabilities, Collections.emptySet()); monitoringService.setNotificationPublisher(notificationPublisher); monitoringService.registerListener(listener); capabilitiesSize = monitoringService.getCapabilities().getCapability().size(); @@ -151,9 +145,11 @@ public class NetconfCapabilityMonitoringServiceTest { public void testGetSchemaForCapability() throws Exception { //test multiple revisions of the same capability monitoringService.onCapabilitiesChanged(Collections.singleton(moduleCapability2), Collections.emptySet()); - final String schema = monitoringService.getSchemaForModuleRevision(TEST_MODULE_NAME, Optional.of(TEST_MODULE_REV)); + final String schema = + monitoringService.getSchemaForModuleRevision(TEST_MODULE_NAME, Optional.of(TEST_MODULE_REV)); Assert.assertEquals(TEST_MODULE_CONTENT, schema); - final String schema2 = monitoringService.getSchemaForModuleRevision(TEST_MODULE_NAME, Optional.of(TEST_MODULE_REV2)); + final String schema2 = + monitoringService.getSchemaForModuleRevision(TEST_MODULE_NAME, Optional.of(TEST_MODULE_REV2)); Assert.assertEquals(TEST_MODULE_CONTENT2, schema2); //remove one revision monitoringService.onCapabilitiesChanged(Collections.emptySet(), Collections.singleton(moduleCapability1)); @@ -166,7 +162,7 @@ public class NetconfCapabilityMonitoringServiceTest { public void testGetCapabilities() throws Exception { Capabilities actual = monitoringService.getCapabilities(); List exp = new ArrayList<>(); - for (Capability capability : CAPABILITIES) { + for (Capability capability : capabilities) { exp.add(new Uri(capability.getCapabilityUri())); } //candidate is added by monitoring service automatically @@ -188,14 +184,15 @@ public class NetconfCapabilityMonitoringServiceTest { final Uri uri = new Uri(capUri); final HashSet testCaps = new HashSet<>(); testCaps.add(new BasicCapability(capUri)); - final ArgumentCaptor capabilityChangeCaptor = ArgumentCaptor.forClass(NetconfCapabilityChange.class); + final ArgumentCaptor capabilityChangeCaptor = + ArgumentCaptor.forClass(NetconfCapabilityChange.class); final ArgumentCaptor monitoringListenerCaptor = ArgumentCaptor.forClass(Capabilities.class); //add capability monitoringService.onCapabilitiesChanged(testCaps, Collections.emptySet()); //remove capability monitoringService.onCapabilitiesChanged(Collections.emptySet(), testCaps); - verify(listener, times(3)).onCapabilitiesChanged((monitoringListenerCaptor.capture())); + verify(listener, times(3)).onCapabilitiesChanged(monitoringListenerCaptor.capture()); verify(notificationPublisher, times(2)).onCapabilityChanged(capabilityChangeCaptor.capture()); //verify listener calls