diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2016-09-18 15:17:02 +0200 |
---|---|---|
committer | Maros Marsalek <mmarsale@cisco.com> | 2016-09-20 15:55:04 +0000 |
commit | 7a7a31ae0a390113399119835bdaa3a4ed694170 (patch) | |
tree | ea5c6bbf21f5d1829d4d6698dc50cc5f48bc096e /v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java | |
parent | 27eba3a20b98378a07178722606752960978ea5a (diff) |
HONEYCOMB-116: refactor v3po tests to use CTU.mockMapping
Change-Id: I72d3a545d66e1280e34beff72adcdf876dae86fd
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java')
-rw-r--r-- | v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java index 6566dfe0b..05e48eeee 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/notification/InterfaceChangeNotificationProducerTest.java @@ -21,26 +21,18 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.google.common.base.Optional; -import com.google.common.collect.Lists; import io.fd.honeycomb.notification.NotificationCollector; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.v3po.test.ContextTestUtils; import io.fd.honeycomb.translate.v3po.util.NamingContext; -import java.util.List; import java.util.concurrent.CompletableFuture; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.Mappings; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.MappingsBuilder; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.Mapping; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.MappingKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.InterfaceStateChange; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.InterfaceStatus; -import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.openvpp.jvpp.core.callback.SwInterfaceSetFlagsNotificationCallback; import org.openvpp.jvpp.core.dto.SwInterfaceSetFlagsNotification; import org.openvpp.jvpp.core.dto.WantInterfaceEvents; @@ -50,9 +42,13 @@ import org.openvpp.jvpp.core.notification.CoreNotificationRegistry; public class InterfaceChangeNotificationProducerTest { + private static final String IFC_CTX_NAME = "ifc-test-instance"; + private static final String IFACE_NAME = "eth0"; + private static final int IFACE_ID = 0; + @Mock private FutureJVppCore jVpp; - private NamingContext namingContext = new NamingContext("test", "test-instance"); + private NamingContext namingContext = new NamingContext("test", IFC_CTX_NAME); @Mock private MappingContext mappingContext; @Mock @@ -71,16 +67,7 @@ public class InterfaceChangeNotificationProducerTest { callbackArgumentCaptor = ArgumentCaptor.forClass(SwInterfaceSetFlagsNotificationCallback.class); doReturn(notificationListenerReg).when(notificationRegistry).registerSwInterfaceSetFlagsNotificationCallback( callbackArgumentCaptor.capture()); - - final KeyedInstanceIdentifier<Mapping, MappingKey> eth0Id = ContextTestUtils - .getMappingIid("eth0", "test-instance"); - final Optional<Mapping> eth0 = ContextTestUtils.getMapping("eth0", 0); - - final List<Mapping> allMappings = Lists.newArrayList(ContextTestUtils.getMapping("eth0", 0).get()); - final Mappings allMappingsBaObject = new MappingsBuilder().setMapping(allMappings).build(); - doReturn(Optional.of(allMappingsBaObject)).when(mappingContext).read(eth0Id.firstIdentifierOf(Mappings.class)); - - doReturn(eth0).when(mappingContext).read(eth0Id); + ContextTestUtils.mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME); } @Test @@ -114,16 +101,15 @@ public class InterfaceChangeNotificationProducerTest { final SwInterfaceSetFlagsNotification swInterfaceSetFlagsNotification = new SwInterfaceSetFlagsNotification(); swInterfaceSetFlagsNotification.deleted = 0; - swInterfaceSetFlagsNotification.swIfIndex = 0; + swInterfaceSetFlagsNotification.swIfIndex = IFACE_ID; swInterfaceSetFlagsNotification.adminUpDown = 1; swInterfaceSetFlagsNotification.linkUpDown = 1; - callbackArgumentCaptor.getValue().onSwInterfaceSetFlagsNotification(swInterfaceSetFlagsNotification); final ArgumentCaptor<InterfaceStateChange> notificationCaptor = ArgumentCaptor.forClass(InterfaceStateChange.class); verify(collector).onNotification(notificationCaptor.capture()); - assertEquals("eth0", notificationCaptor.getValue().getName().getString()); + assertEquals(IFACE_NAME, notificationCaptor.getValue().getName().getString()); assertEquals(InterfaceStatus.Up, notificationCaptor.getValue().getAdminStatus()); assertEquals(InterfaceStatus.Up, notificationCaptor.getValue().getOperStatus()); } |