From a4928d560b31df507472b17ac641c3f242d17b3a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Thu, 22 Sep 2016 13:17:00 +0200 Subject: HONEYCOMB-116: base classes for testing customizers - adds base class for testing writers - moves base classes to vpp-translate-test, subproject of vpp-common Change-Id: Ia42e2be3a95a33866d1996dd42a9bd1773b970a7 Signed-off-by: Marek Gradzki --- .../write/RemoteMappingCustomizerTest.java | 40 ++++++---------------- 1 file changed, 10 insertions(+), 30 deletions(-) (limited to 'lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java') diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java index 7797db1f7..30c168e72 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizerTest.java @@ -24,22 +24,16 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import io.fd.honeycomb.lisp.context.util.EidMappingContext; -import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.v3po.util.TranslateUtils; -import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; +import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.Lisp; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.MapReplyAction; @@ -54,18 +48,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.eid.table.grouping.eid.table.vni.table.remote.mappings.remote.mapping.Eid; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.eid.table.grouping.eid.table.vni.table.remote.mappings.remote.mapping.EidBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.eid.table.grouping.eid.table.vni.table.remote.mappings.remote.mapping.locator.list.NegativeMappingBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.eid.table.grouping.eid.table.vni.table.remote.mappings.remote.mapping.locator.list.positive.mapping.rlocs.Locator; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev160520.eid.table.grouping.eid.table.vni.table.remote.mappings.remote.mapping.locator.list.positive.mapping.rlocs.LocatorBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.openvpp.jvpp.core.dto.LispAddDelRemoteMapping; import org.openvpp.jvpp.core.dto.LispAddDelRemoteMappingReply; -import org.openvpp.jvpp.core.future.FutureJVppCore; -public class RemoteMappingCustomizerTest { - - @Mock - private FutureJVppCore fakeJvpp; +public class RemoteMappingCustomizerTest extends WriterCustomizerTest { @Captor private ArgumentCaptor mappingCaptor; @@ -77,14 +65,9 @@ public class RemoteMappingCustomizerTest { private CompletableFuture completeFuture; private InstanceIdentifier id; private EidMappingContext remoteMappingContext; - private WriteContext writeContext; - private MappingContext mapping; - - - @Before - public void init() { - MockitoAnnotations.initMocks(this); + @Override + public void setUp() { final Eid eid = new EidBuilder().setAddress( new Ipv4Builder().setIpv4( new Ipv4Address("192.168.2.1")) @@ -94,8 +77,6 @@ public class RemoteMappingCustomizerTest { mappingId = new MappingId("REMOTE"); final RemoteMappingKey key = new RemoteMappingKey(mappingId); remoteMappingContext = new EidMappingContext("remote"); - mapping = mock(MappingContext.class); - writeContext = mock(WriteContext.class); intf = new RemoteMappingBuilder() @@ -112,11 +93,10 @@ public class RemoteMappingCustomizerTest { fakeReply = new LispAddDelRemoteMappingReply(); completeFuture = new CompletableFuture<>(); completeFuture.complete(fakeReply); - customizer = new RemoteMappingCustomizer(fakeJvpp, remoteMappingContext); + customizer = new RemoteMappingCustomizer(api, remoteMappingContext); - when(fakeJvpp.lispAddDelRemoteMapping(Mockito.any())).thenReturn(completeFuture); - when(writeContext.getMappingContext()).thenReturn(mapping); - when(mapping.read(Mockito.any())).thenReturn(com.google.common.base.Optional + when(api.lispAddDelRemoteMapping(Mockito.any())).thenReturn(completeFuture); + when(mappingContext.read(Mockito.any())).thenReturn(com.google.common.base.Optional .of(new RemoteMappingBuilder().setKey(key).setId(mappingId).setEid(eid).build())); } @@ -134,11 +114,11 @@ public class RemoteMappingCustomizerTest { @Test public void testWriteCurrentAttributes() throws WriteFailedException, InterruptedException, ExecutionException { //to simulate no mapping - when(mapping.read(Mockito.any())).thenReturn(com.google.common.base.Optional.absent()); + when(mappingContext.read(Mockito.any())).thenReturn(com.google.common.base.Optional.absent()); customizer.writeCurrentAttributes(id, intf, writeContext); - verify(fakeJvpp, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); + verify(api, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); LispAddDelRemoteMapping request = mappingCaptor.getValue(); @@ -162,7 +142,7 @@ public class RemoteMappingCustomizerTest { public void testDeleteCurrentAttributes() throws WriteFailedException, InterruptedException, ExecutionException { customizer.deleteCurrentAttributes(id, intf, writeContext); - verify(fakeJvpp, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); + verify(api, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); LispAddDelRemoteMapping request = mappingCaptor.getValue(); -- cgit 1.2.3-korg