Added more unit tests

Author: russgold

operator/src/main/java/oracle/kubernetes/operator/helpers/AsyncRequestStepFactory.java

@@ -0,0 +1,14 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helpers;
+
+import oracle.kubernetes.operator.calls.CallFactory;
+import oracle.kubernetes.operator.calls.RequestParams;
+import oracle.kubernetes.operator.work.Step;
+
+public interface AsyncRequestStepFactory {
+  <T> Step createRequestAsync(ResponseStep<T> next, RequestParams requestParams, CallFactory<T> factory,
+                              ClientPool helper, int timeoutSeconds, int maxRetryCount,
+                              String fieldSelector, String labelSelector, String resourceVersion);
+}

operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java

@@ -977,8 +977,10 @@ public Step deleteIngressAsync(String name, String namespace, V1DeleteOptions de
   }
 
 
+  private static final AsyncRequestStepFactory STEP_FACTORY = AsyncRequestStep::new;
+
   private <T> Step createRequestAsync(ResponseStep<T> next, RequestParams requestParams, CallFactory<T> factory) {
-    return new AsyncRequestStep<>(next, requestParams, factory, helper, timeoutSeconds, maxRetryCount, fieldSelector, labelSelector, resourceVersion);
+    return STEP_FACTORY.createRequestAsync(next, requestParams, factory, helper, timeoutSeconds, maxRetryCount, fieldSelector, labelSelector, resourceVersion);
   }
 
 

operator/src/test/java/oracle/kubernetes/operator/calls/AsyncRequestStepTest.java

@@ -87,6 +87,15 @@ public void afterFiber_timeoutStepScheduled() throws Exception {
     assertTrue(schedule.containsStepAt(TIMEOUT_SECONDS, TimeUnit.SECONDS));
   }
 
+  @Test
+  public void afterTimeout_newRequestSent() throws Exception {
+    callFactory.clearRequest();
+
+    schedule.setTime(TIMEOUT_SECONDS, TimeUnit.SECONDS);
+
+    assertTrue(callFactory.invokedWith(requestParams));
+  }
+
   @Test
   public void afterSuccessfulCallback_nextStepAppliedWithValue() throws Exception {
     callFactory.sendSuccessfulCallback(17);
@@ -103,16 +112,31 @@ public void afterSuccessfulCallback_packetDoesNotContainsResponse() throws Excep
 
   @Test
   public void afterFailedCallback_packetContainsRetryStrategy() throws Exception {
-    schedule.execute(() ->
-      callFactory.sendFailedCallback(new ApiException("test failure"), HttpURLConnection.HTTP_UNAVAILABLE));
+    sendFailedCallback(HttpURLConnection.HTTP_UNAVAILABLE);
 
     assertThat(packet.getComponents().get(RESPONSE_COMPONENT_NAME).getSPI(RetryStrategy.class), notNullValue());
   }
 
+  private void sendFailedCallback(int statusCode) {
+    schedule.execute(() -> callFactory.sendFailedCallback(new ApiException("test failure"), statusCode));
+  }
+
+  @Test
+  public void afterFailedCallback_retrySentAfterDelay() throws Exception {
+    sendFailedCallback(HttpURLConnection.HTTP_UNAVAILABLE);
+    callFactory.clearRequest();
+
+    schedule.setTime(TIMEOUT_SECONDS-1, TimeUnit.SECONDS);
+
+    assertTrue(callFactory.invokedWith(requestParams));
+  }
+
   // todo tests
-  // after timeout, packet contains retry strategy
-  // after either failure, setting time to before the timeout causes new request
-  // after new request, success leads to invocation
+  // can new request clear timeout action?
+  // what is accessContinue?
+  // test CONFLICT (409) status
+  // no retry if status not handled
+  // test exceeded retry count
 
 
   static class TestStep extends ResponseStep<Integer> {
@@ -135,15 +159,19 @@ static class CallFactoryStub implements CallFactory<Integer> {
     private RequestParams requestParams;
     private ApiCallback<Integer> callback;
 
-    private boolean invokedWith(RequestParams requestParams) {
+    void clearRequest() {
+      requestParams = null;
+    }
+
+    boolean invokedWith(RequestParams requestParams) {
       return requestParams == this.requestParams;
     }
 
-    private void sendSuccessfulCallback(Integer callbackValue) {
+    void sendSuccessfulCallback(Integer callbackValue) {
       callback.onSuccess(callbackValue, HttpURLConnection.HTTP_OK, Collections.emptyMap());
     }
 
-    private void sendFailedCallback(ApiException exception, int statusCode) {
+    void sendFailedCallback(ApiException exception, int statusCode) {
       callback.onFailure(exception, statusCode, Collections.emptyMap());
     }