another few set of tests

Author: shijiesheng

src/test/java/com/uber/cadence/worker/CleanWorkerShutdownTest.java

@@ -32,9 +32,8 @@
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowClientOptions;
 import com.uber.cadence.client.WorkflowOptions;
-import com.uber.cadence.serviceclient.ClientOptions;
 import com.uber.cadence.serviceclient.IWorkflowService;
-import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
+import com.uber.cadence.testUtils.TestEnvironment;
 import com.uber.cadence.testing.TestEnvironmentOptions;
 import com.uber.cadence.testing.TestWorkflowEnvironment;
 import com.uber.cadence.workflow.Workflow;
@@ -57,8 +56,7 @@
 @RunWith(Parameterized.class)
 public class CleanWorkerShutdownTest {
 
-  private static final boolean useDockerService =
-      Boolean.parseBoolean(System.getenv("USE_DOCKER_SERVICE"));
+  private static final boolean useDockerService = TestEnvironment.isUseDockerService();
 
   @Parameterized.Parameter public boolean useExternalService;
 
@@ -81,7 +79,7 @@ public static Object[] data() {
   @Before
   public void setUp() {
     if (useExternalService) {
-      service = new WorkflowServiceTChannel(ClientOptions.defaultInstance());
+      service = TestEnvironment.getDockerService();
     }
   }
 

src/test/java/com/uber/cadence/worker/WorkerStressTests.java

@@ -26,9 +26,8 @@
 import com.uber.cadence.client.WorkflowClientOptions;
 import com.uber.cadence.client.WorkflowOptions;
 import com.uber.cadence.client.WorkflowStub;
-import com.uber.cadence.serviceclient.ClientOptions;
 import com.uber.cadence.serviceclient.IWorkflowService;
-import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
+import com.uber.cadence.testUtils.TestEnvironment;
 import com.uber.cadence.testing.TestEnvironmentOptions;
 import com.uber.cadence.testing.TestWorkflowEnvironment;
 import com.uber.cadence.workflow.Async;
@@ -53,8 +52,7 @@
 @RunWith(Parameterized.class)
 public class WorkerStressTests {
 
-  private static final boolean useDockerService =
-      Boolean.parseBoolean(System.getenv("USE_DOCKER_SERVICE"));
+  private static final boolean useDockerService = true || TestEnvironment.isUseDockerService();
 
   @Parameterized.Parameter public boolean useExternalService;
 
@@ -181,7 +179,7 @@ public TestEnvironmentWrapper(WorkerFactoryOptions options) {
       WorkflowClientOptions clientOptions =
           WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build();
       if (useDockerService) {
-        IWorkflowService service = new WorkflowServiceTChannel(ClientOptions.defaultInstance());
+        IWorkflowService service = TestEnvironment.getDockerService();
         WorkflowClient client = WorkflowClient.newInstance(service, clientOptions);
         factory = WorkerFactory.newInstance(client, options);
       } else {

src/test/java/com/uber/cadence/workerFactory/WorkerFactoryTests.java

@@ -20,9 +20,8 @@
 import static org.junit.Assert.*;
 
 import com.uber.cadence.client.WorkflowClient;
-import com.uber.cadence.serviceclient.ClientOptions;
 import com.uber.cadence.serviceclient.IWorkflowService;
-import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
+import com.uber.cadence.testUtils.TestEnvironment;
 import com.uber.cadence.worker.WorkerFactory;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
@@ -33,8 +32,7 @@
 
 public class WorkerFactoryTests {
 
-  private static final boolean useDockerService =
-      Boolean.parseBoolean(System.getenv("USE_DOCKER_SERVICE"));
+  private static final boolean useDockerService = TestEnvironment.isUseDockerService();
 
   @BeforeClass
   public static void beforeClass() {
@@ -47,7 +45,7 @@ public static void beforeClass() {
 
   @Before
   public void setUp() {
-    service = new WorkflowServiceTChannel(ClientOptions.defaultInstance());
+    service = TestEnvironment.getDockerService();
     client = WorkflowClient.newInstance(service);
     factory = WorkerFactory.newInstance(client);
   }