fix unit test

Author: shijiesheng

src/test/java/com/uber/cadence/internal/replay/ReplayDeciderCacheTests.java

@@ -209,7 +209,7 @@ public void evictAnyWillInvalidateAnEntryRandomlyFromTheCache() throws Exception
     // Wait for reporter
     Thread.sleep(600);
     verify(reporter, atLeastOnce())
-        .reportCounter(eq(MetricsType.STICKY_CACHE_TOTAL_FORCED_EVICTION), eq(tags), anyInt());
+        .reportCounter(eq(MetricsType.STICKY_CACHE_TOTAL_FORCED_EVICTION), eq(tags), anyLong());
   }
 
   @Test

src/test/java/com/uber/cadence/internal/sync/DeterministicRunnerTest.java

@@ -779,7 +779,7 @@ public void workflowThreadsWillEvictCacheWhenMaxThreadCountIsHit() throws Throwa
     // Wait for reporter
     Thread.sleep(600);
     verify(reporter, atLeastOnce())
-        .reportCounter(eq(MetricsType.STICKY_CACHE_THREAD_FORCED_EVICTION), eq(tags), anyInt());
+        .reportCounter(eq(MetricsType.STICKY_CACHE_THREAD_FORCED_EVICTION), eq(tags), anyLong());
   }
 
   @Test

src/test/java/com/uber/cadence/internal/worker/WorkerShutDownHandlerTest.java

@@ -32,18 +32,15 @@
 import org.mockito.Mock;
 
 public class WorkerShutDownHandlerTest {
-  @Before
-  public void setUp() {
-    mockClient = mock(WorkflowClient.class);
-    mockService = mock(IWorkflowService.class);
-  }
 
   @Mock private WorkflowClient mockClient;
 
   @Mock private IWorkflowService mockService;
 
   @Before
   public void setup() {
+    mockClient = mock(WorkflowClient.class);
+    mockService = mock(IWorkflowService.class);
     WorkflowClientOptions clientOptions =
         WorkflowClientOptions.newBuilder().setMetricsScope(new NoopScope()).build();
     when(mockClient.getOptions()).thenReturn(clientOptions);

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

@@ -21,8 +21,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -156,8 +155,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedSignals() throws Exception
             .build();
     Thread.sleep(600);
     verify(reporter, atLeastOnce())
-        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyInt());
-    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyInt());
+        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyLong());
+    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyLong());
 
     // Finish Workflow
     wrapper.close();
@@ -269,8 +268,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedActivities() throws Except
             .put(MetricsTag.TASK_LIST, STICKY_TASK_LIST_METRIC_TAG)
             .build();
     verify(reporter, atLeastOnce())
-        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyInt());
-    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyInt());
+        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyLong());
+    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyLong());
 
     // Finish Workflow
     wrapper.close();
@@ -318,8 +317,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedChildWorkflows() throws Ex
             .put(MetricsTag.TASK_LIST, STICKY_TASK_LIST_METRIC_TAG)
             .build();
     verify(reporter, atLeastOnce())
-        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyInt());
-    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyInt());
+        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyLong());
+    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyLong());
     // Finish Workflow
     wrapper.close();
   }
@@ -374,8 +373,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedMutableSideEffect() throws
             .put(MetricsTag.TASK_LIST, STICKY_TASK_LIST_METRIC_TAG)
             .build();
     verify(reporter, atLeastOnce())
-        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyInt());
-    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyInt());
+        .reportCounter(eq(MetricsType.STICKY_CACHE_HIT), eq(tags), anyLong());
+    verify(reporter, never()).reportCounter(eq(MetricsType.STICKY_CACHE_MISS), eq(tags), anyLong());
     // Finish Workflow
     wrapper.close();
   }

src/test/java/com/uber/cadence/workflow/WorkflowTest.java

@@ -27,8 +27,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.google.common.base.Strings;
 import com.google.common.util.concurrent.UncheckedExecutionException;
@@ -5730,10 +5728,6 @@ public String getState() {
 
   @Test
   public void testGetVersionRetry() throws ExecutionException, InterruptedException {
-    TestActivities activity = mock(TestActivities.class);
-    when(activity.activity1(1)).thenReturn(1);
-    cadenceTestRule.getWorker().registerActivitiesImplementations(activity);
-
     startWorkerFor(TestGetVersionWorkflowRetryImpl.class);
     TestWorkflow3 workflowStub =
         workflowClient.newWorkflowStub(