diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2017-04-24 09:39:59 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-04-24 08:07:47 +0000 |
commit | 470588683af86c9ab73538ced85e1d88f55e3b70 (patch) | |
tree | 127211cd95071b425ec5e4836cccf7f45e70fe6c /lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java | |
parent | e4139584aaf94df71a4ddb5e5a0dded1a80c249d (diff) |
HC2VPP-124 - Post lisp apis to one***
All apis starting with prefix lisp*** will be abandoned, so refactoring
to one*** variants
Change-Id: I603b3ce54ef1f8b6cefaaccedb87ccbf3ea38dd0
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java')
-rwxr-xr-x | lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java index 76017a439..bc7703b20 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapResolver; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapResolverReply; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolver; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolverReply; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -49,9 +49,9 @@ public class MapResolverCustomizerTest extends LispWriterCustomizerTest implemen customizer = new MapResolverCustomizer(api, lispStateCheckService); } - private void whenLispAddDelMapResolverThenSuccess() { - when(api.lispAddDelMapResolver(any(LispAddDelMapResolver.class))) - .thenReturn(future(new LispAddDelMapResolverReply())); + private void whenOneAddDelMapResolverThenSuccess() { + when(api.oneAddDelMapResolver(any(OneAddDelMapResolver.class))) + .thenReturn(future(new OneAddDelMapResolverReply())); } @Test(expected = NullPointerException.class) @@ -69,14 +69,14 @@ public class MapResolverCustomizerTest extends LispWriterCustomizerTest implemen Ipv4Address address = new Ipv4Address("192.168.2.1"); MapResolver resolver = new MapResolverBuilder().setIpAddress(new IpAddress(address)).build(); - whenLispAddDelMapResolverThenSuccess(); + whenOneAddDelMapResolverThenSuccess(); customizer.writeCurrentAttributes(null, resolver, null); - ArgumentCaptor<LispAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(LispAddDelMapResolver.class); - verify(api, times(1)).lispAddDelMapResolver(resolverCaptor.capture()); + ArgumentCaptor<OneAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(OneAddDelMapResolver.class); + verify(api, times(1)).oneAddDelMapResolver(resolverCaptor.capture()); - LispAddDelMapResolver request = resolverCaptor.getValue(); + OneAddDelMapResolver request = resolverCaptor.getValue(); assertEquals(1, request.isAdd); assertEquals("192.168.2.1", arrayToIpv4AddressNoZone(request.ipAddress).getValue()); } @@ -92,14 +92,14 @@ public class MapResolverCustomizerTest extends LispWriterCustomizerTest implemen Ipv4Address address = new Ipv4Address("192.168.2.1"); MapResolver resolver = new MapResolverBuilder().setIpAddress(new IpAddress(address)).build(); - whenLispAddDelMapResolverThenSuccess(); + whenOneAddDelMapResolverThenSuccess(); customizer.deleteCurrentAttributes(null, resolver, null); - ArgumentCaptor<LispAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(LispAddDelMapResolver.class); - verify(api, times(1)).lispAddDelMapResolver(resolverCaptor.capture()); + ArgumentCaptor<OneAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(OneAddDelMapResolver.class); + verify(api, times(1)).oneAddDelMapResolver(resolverCaptor.capture()); - LispAddDelMapResolver request = resolverCaptor.getValue(); + OneAddDelMapResolver request = resolverCaptor.getValue(); assertEquals(0, request.isAdd); assertEquals("192.168.2.1", arrayToIpv4AddressNoZone(request.ipAddress).getValue()); } |