Move test code into testing module (#292)

Author: vitarb

settings.gradle

@@ -1,3 +1,4 @@
 rootProject.name='temporalio'
 include 'temporal-serviceclient'
 include 'temporal-sdk'
+include 'temporal-testing'

temporal-sdk/build.gradle

@@ -51,6 +51,7 @@ dependencies {
         implementation 'javax.annotation:javax.annotation-api:1.3.2'
     }
 
+    testImplementation project(':temporal-testing')
     testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
     testImplementation group: 'com.googlecode.junit-toolbox', name: 'junit-toolbox', version: '2.4'
     testImplementation group: 'junit', name: 'junit', version: '4.13.1'

temporal-sdk/src/main/java/io/temporal/failure/FailureConverter.java

@@ -37,7 +37,6 @@
 import io.temporal.common.converter.DataConverter;
 import io.temporal.common.converter.EncodedValues;
 import io.temporal.internal.common.CheckedExceptionWrapper;
-import io.temporal.testing.SimulatedTimeoutFailure;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Optional;

temporal-sdk/src/main/java/io/temporal/testing/SimulatedTimeoutFailure.java renamed to temporal-sdk/src/main/java/io/temporal/failure/SimulatedTimeoutFailure.java

@@ -17,10 +17,9 @@
  *  permissions and limitations under the License.
  */
 
-package io.temporal.testing;
+package io.temporal.failure;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.temporal.failure.TimeoutFailure;
 
 /** Internal do not use in application code. */
 @VisibleForTesting

temporal-sdk/src/main/java/io/temporal/internal/statemachines/StateMachineDefinition.java

@@ -314,9 +314,8 @@ public String asPlantUMLStateDiagram() {
       result.append(finalState);
       result.append(" --> [*]\n");
     }
-    int year = Calendar.getInstance().get(Calendar.YEAR);
     result.append("center footer Copyright (C) ");
-    result.append(year);
+    result.append("2020");
     result.append(" Temporal Technologies, Inc. All Rights Reserved.\n");
     result.append("@enduml\n");
     return result.toString();
@@ -407,9 +406,8 @@ public String asPlantUMLStateDiagramCoverage(
       result.append(finalState);
       result.append(" --> [*]\n");
     }
-    int year = Calendar.getInstance().get(Calendar.YEAR);
     result.append("center footer Copyright (C) ");
-    result.append(year);
+    result.append("2020");
     result.append(" Temporal Technologies, Inc. All Rights Reserved.\n");
     result.append("@enduml\n");
     return result.toString();

temporal-sdk/src/main/java/io/temporal/internal/sync/ActivityInvocationHandler.java

@@ -19,6 +19,7 @@
 
 package io.temporal.internal.sync;
 
+import com.google.common.annotations.VisibleForTesting;
 import io.temporal.activity.ActivityOptions;
 import io.temporal.common.MethodRetry;
 import io.temporal.common.interceptors.WorkflowOutboundCallsInterceptor;
@@ -27,11 +28,13 @@
 import java.lang.reflect.Method;
 import java.util.function.Function;
 
-class ActivityInvocationHandler extends ActivityInvocationHandlerBase {
+@VisibleForTesting
+public class ActivityInvocationHandler extends ActivityInvocationHandlerBase {
   private final ActivityOptions options;
   private final WorkflowOutboundCallsInterceptor activityExecutor;
 
-  static InvocationHandler newInstance(
+  @VisibleForTesting
+  public static InvocationHandler newInstance(
       Class<?> activityInterface,
       ActivityOptions options,
       WorkflowOutboundCallsInterceptor activityExecutor) {

temporal-sdk/src/main/java/io/temporal/internal/sync/ActivityInvocationHandlerBase.java

@@ -21,6 +21,7 @@
 
 import static io.temporal.internal.common.InternalUtils.getValueOrDefault;
 
+import com.google.common.annotations.VisibleForTesting;
 import io.temporal.common.MethodRetry;
 import io.temporal.internal.sync.AsyncInternal.AsyncMarker;
 import java.lang.reflect.InvocationHandler;
@@ -31,12 +32,14 @@
 import java.util.function.Function;
 
 /** Dynamic implementation of a strongly typed activity interface. */
-abstract class ActivityInvocationHandlerBase implements InvocationHandler {
+@VisibleForTesting
+public abstract class ActivityInvocationHandlerBase implements InvocationHandler {
 
   private final Map<Method, Function<Object[], Object>> methodFunctions = new HashMap<>();
 
+  @VisibleForTesting
   @SuppressWarnings("unchecked")
-  static <T> T newProxy(Class<T> activityInterface, InvocationHandler invocationHandler) {
+  public static <T> T newProxy(Class<T> activityInterface, InvocationHandler invocationHandler) {
     return (T)
         Proxy.newProxyInstance(
             activityInterface.getClassLoader(),

temporal-sdk/src/main/java/io/temporal/internal/sync/DeterministicRunnerWrapper.java

@@ -19,17 +19,20 @@
 
 package io.temporal.internal.sync;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-class DeterministicRunnerWrapper implements InvocationHandler {
+@VisibleForTesting
+public class DeterministicRunnerWrapper implements InvocationHandler {
 
   private final InvocationHandler invocationHandler;
 
-  DeterministicRunnerWrapper(InvocationHandler invocationHandler) {
+  @VisibleForTesting
+  public DeterministicRunnerWrapper(InvocationHandler invocationHandler) {
     this.invocationHandler = Objects.requireNonNull(invocationHandler);
   }
 

temporal-sdk/src/main/java/io/temporal/internal/sync/LoggingInterceptor.java

@@ -26,12 +26,11 @@
 import io.grpc.ServerCallHandler;
 import io.grpc.Status;
 import io.temporal.internal.common.WorkflowExecutionUtils;
-import io.temporal.internal.testservice.TestWorkflowService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 class LoggingInterceptor implements io.grpc.ServerInterceptor {
-  private static final Logger log = LoggerFactory.getLogger(TestWorkflowService.class);
+  private static final Logger log = LoggerFactory.getLogger(LoggingInterceptor.class);
 
   @Override
   public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(

temporal-sdk/src/main/java/io/temporal/internal/sync/POJOActivityTaskHandler.java

@@ -38,6 +38,7 @@
 import io.temporal.common.interceptors.ActivityInboundCallsInterceptor;
 import io.temporal.common.interceptors.ActivityInterceptor;
 import io.temporal.failure.FailureConverter;
+import io.temporal.failure.SimulatedTimeoutFailure;
 import io.temporal.failure.TemporalFailure;
 import io.temporal.failure.TimeoutFailure;
 import io.temporal.internal.common.CheckedExceptionWrapper;
@@ -47,7 +48,6 @@
 import io.temporal.internal.worker.ActivityTaskHandler;
 import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
-import io.temporal.testing.SimulatedTimeoutFailure;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -61,7 +61,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final class POJOActivityTaskHandler implements ActivityTaskHandler {
+@VisibleForTesting
+public final class POJOActivityTaskHandler implements ActivityTaskHandler {
 
   private static final Logger log = LoggerFactory.getLogger(POJOActivityTaskHandler.class);
 
@@ -74,7 +75,8 @@ final class POJOActivityTaskHandler implements ActivityTaskHandler {
       Collections.synchronizedMap(new HashMap<>());
   private ActivityTaskExecutor dynamicActivity;
 
-  POJOActivityTaskHandler(
+  @VisibleForTesting
+  public POJOActivityTaskHandler(
       WorkflowServiceStubs service,
       String namespace,
       DataConverter dataConverter,
@@ -164,7 +166,7 @@ public Set<String> getRegisteredActivityTypes() {
     return activities.keySet();
   }
 
-  void registerActivityImplementations(Object[] activitiesImplementation) {
+  public void registerActivityImplementations(Object[] activitiesImplementation) {
     for (Object activity : activitiesImplementation) {
       registerActivityImplementation(activity, POJOActivityImplementation::new);
     }