PR for CallExecutor does not know the type of a result #72

Avoid dependency on any mock for tests of a result type

Author: dev3loperb

src/test/java/com/evanlennick/retry4j/AsyncCallExecutorTest_ListenersTest.java

@@ -2,33 +2,24 @@
 
 import com.evanlennick.retry4j.config.RetryConfig;
 import com.evanlennick.retry4j.config.RetryConfigBuilder;
-import com.evanlennick.retry4j.listener.RetryListener;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.time.temporal.ChronoUnit;
-import java.util.concurrent.Callable;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 public class AsyncCallExecutorTest_ListenersTest {
-    @Mock
-    private DummyMock dummyMock;
     private AsyncCallExecutor<String> executor;
-    private Callable<String> callable;
 
     @BeforeMethod
     public void setup() {
         MockitoAnnotations.initMocks(this);
 
-        callable = () -> dummyMock.callableCallThis();
-
         RetryConfig config = new RetryConfigBuilder()
                 .retryOnAnyException()
                 .withMaxNumberOfTries(5)
@@ -41,33 +32,17 @@ public void setup() {
 
     @Test
     public void verifyOnListener_resultHasTypeOfCallExecutor() throws Exception {
-        when(dummyMock.callableCallThis())
-                .thenReturn("success!");
-
-        RetryListener<String> listener = status -> {
-            dummyMock.listenersCallThis();
-            assertThat(status.getResult()).isInstanceOf(String.class);
-        };
+        List<String> methodCalls = new ArrayList<>();
         executor
-                .onSuccess(listener)
-                .onCompletion(listener)
-                .execute(callable).get();
-
-        // ensure both listeners are called
-        verify(dummyMock, timeout(1000).times(2)).listenersCallThis();
-    }
-
-    private class DummyMock {
-        public String listenersCallThis() {
-            return "this is to use to verify listeners call the mock";
-        }
-
-        public String listenersCallThis(Exception e) {
-            return "this is to verify exceptions in the after failed call listener";
-        }
-
-        public String callableCallThis() {
-            return "this is to use for mocking the executed callable";
-        }
+                .onSuccess(status -> {
+                    methodCalls.add("onSuccess");
+                    assertThat(status.getResult()).isInstanceOf(String.class);
+                })
+                .onCompletion(status -> {
+                    methodCalls.add("onCompletion");
+                    assertThat(status.getResult()).isInstanceOf(String.class);
+                })
+                .execute(() -> "").get();
+        assertThat(methodCalls).contains("onSuccess", "onCompletion");
     }
 }

src/test/java/com/evanlennick/retry4j/CallExecutorTest_ListenersTest.java

@@ -2,13 +2,14 @@
 
 import com.evanlennick.retry4j.config.RetryConfig;
 import com.evanlennick.retry4j.config.RetryConfigBuilder;
-import com.evanlennick.retry4j.listener.RetryListener;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Callable;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -197,20 +198,18 @@ public void verifyOnFailureListener_populatesException() {
 
     @Test
     public void verifyOnListener_resultHasTypeOfCallExecutor() {
-        when(dummyMock.callableCallThis())
-                .thenReturn("success!");
-
-        RetryListener<String> listener = status -> {
-            dummyMock.listenersCallThis();
-            assertThat(status.getResult()).isInstanceOf(String.class);
-        };
+        List<String> methodCalls = new ArrayList<>();
         executor
-                .onSuccess(listener)
-                .onCompletion(listener)
-                .execute(callable);
-
-        // ensure both listeners are called
-        verify(dummyMock, timeout(1000).times(2)).listenersCallThis();
+                .onSuccess(status -> {
+                    methodCalls.add("onSuccess");
+                    assertThat(status.getResult()).isInstanceOf(String.class);
+                })
+                .onCompletion(status -> {
+                    methodCalls.add("onCompletion");
+                    assertThat(status.getResult()).isInstanceOf(String.class);
+                })
+                .execute(() -> "");
+        assertThat(methodCalls).contains("onSuccess", "onCompletion");
     }
 
     private class DummyMock {