HONEYCOMB-116: utility for stubbing jvpp methods

- introduces FutureProducer (inspired by https://gerrit.fd.io/r/#/c/2650/)
- updates unit tests for v3po and lisp

Change-Id: I56488bb1dcd6fcaf6821a58f99b528677e095662
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

1 files changed, 1 insertions, 8 deletions

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 30c168e72..9eca7cf67 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
@@ -27,7 +27,6 @@ import io.fd.honeycomb.lisp.context.util.EidMappingContext;
 import io.fd.honeycomb.translate.v3po.util.TranslateUtils;
 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.Test;
 import org.mockito.ArgumentCaptor;
@@ -61,8 +60,6 @@ public class RemoteMappingCustomizerTest extends WriterCustomizerTest {
     private MappingId mappingId;
     private RemoteMappingCustomizer customizer;
     private RemoteMapping intf;
-    private LispAddDelRemoteMappingReply fakeReply;
-    private CompletableFuture<LispAddDelRemoteMappingReply> completeFuture;
     private InstanceIdentifier<RemoteMapping> id;
     private EidMappingContext remoteMappingContext;
 
@@ -78,7 +75,6 @@ public class RemoteMappingCustomizerTest extends WriterCustomizerTest {
         final RemoteMappingKey key = new RemoteMappingKey(mappingId);
         remoteMappingContext = new EidMappingContext("remote");
 
-
         intf = new RemoteMappingBuilder()
                 .setEid(
                         eid)
@@ -90,12 +86,9 @@ public class RemoteMappingCustomizerTest extends WriterCustomizerTest {
                 .child(RemoteMappings.class)
                 .child(RemoteMapping.class, key).build();
 
-        fakeReply = new LispAddDelRemoteMappingReply();
-        completeFuture = new CompletableFuture<>();
-        completeFuture.complete(fakeReply);
         customizer = new RemoteMappingCustomizer(api, remoteMappingContext);
 
-        when(api.lispAddDelRemoteMapping(Mockito.any())).thenReturn(completeFuture);
+        when(api.lispAddDelRemoteMapping(Mockito.any())).thenReturn(future(new LispAddDelRemoteMappingReply()));
         when(mappingContext.read(Mockito.any())).thenReturn(com.google.common.base.Optional
                 .of(new RemoteMappingBuilder().setKey(key).setId(mappingId).setEid(eid).build()));
     }