SDKTestWorkflowRule wasn't calling shutdown (temporalio#2243)

* Fixed SDKTestWorkflowRule to call shutdown * Fixed test broken after rule fix
Quinn-With-Two-Ns · Oct 1, 2024 · 156f4f1 · 156f4f1
1 parent 52aa9e8
commit 156f4f1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/SagaTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/SagaTest.java
@@ -57,6 +57,7 @@ public void testSaga() {
             "activity customActivity1",
             "executeChildWorkflow TestNoArgsWorkflowFunc",
             "interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
+            "registerUpdateHandlers update",
             "newThread workflow-method",
             "executeActivity ThrowIO",
             "activity ThrowIO",

diff --git a/...ral-sdk/src/test/java/io/temporal/workflow/activityTests/ParallelLocalActivitiesTest.java b/...ral-sdk/src/test/java/io/temporal/workflow/activityTests/ParallelLocalActivitiesTest.java
@@ -69,7 +69,6 @@ public void testParallelLocalActivities() {
     expected.add("newThread workflow-method");
     for (int i = 0; i < TestParallelLocalActivitiesWorkflowImpl.COUNT; i++) {
       expected.add("executeLocalActivity SleepActivity");
-      expected.add("currentTimeMillis");
     }
     for (int i = 0; i < TestParallelLocalActivitiesWorkflowImpl.COUNT; i++) {
       expected.add("local activity SleepActivity");

diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/activityTests/TestLocalActivity.java b/temporal-sdk/src/test/java/io/temporal/workflow/activityTests/TestLocalActivity.java
@@ -71,12 +71,10 @@ public void testLocalActivity() {
             "interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
             "newThread workflow-method",
             "executeLocalActivity ThrowIO",
-            "currentTimeMillis",
             "local activity ThrowIO",
             "local activity ThrowIO",
             "local activity ThrowIO",
             "executeLocalActivity Activity2",
-            "currentTimeMillis",
             "local activity Activity2",
             "executeActivity Activity2",
             "activity Activity2");
@@ -115,12 +113,10 @@ public void testLocalActivityNoInput() {
             "interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
             "newThread workflow-method",
             "executeLocalActivity ThrowIO",
-            "currentTimeMillis",
             "local activity ThrowIO",
             "local activity ThrowIO",
             "local activity ThrowIO",
             "executeLocalActivity Activity2",
-            "currentTimeMillis",
             "local activity Activity2",
             "executeActivity Activity2",
             "activity Activity2");

diff --git a/...al-sdk/src/test/java/io/temporal/workflow/searchattributes/UpsertSearchAttributeTest.java b/...al-sdk/src/test/java/io/temporal/workflow/searchattributes/UpsertSearchAttributeTest.java
@@ -69,8 +69,12 @@ public void testUpsertSearchAttributes() {
             "interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
             "newThread workflow-method",
             "upsertSearchAttributes",
-            "executeActivity Activity",
-            "activity Activity");
+            "sleep PT0.1S",
+            "upsertSearchAttributes",
+            "sleep PT0.1S",
+            "upsertSearchAttributes",
+            "upsertSearchAttributes",
+            "sleep PT0.1S");
     testWorkflowRule.assertHistoryEvent(
         execution.getWorkflowId(), EventType.EVENT_TYPE_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES);
   }

diff --git a/...k/src/test/java/io/temporal/workflow/searchattributes/UpsertTypedSearchAttributeTest.java b/...k/src/test/java/io/temporal/workflow/searchattributes/UpsertTypedSearchAttributeTest.java
@@ -72,9 +72,16 @@ public void testUpsertSearchAttributes() {
         .setExpected(
             "interceptExecuteWorkflow " + SDKTestWorkflowRule.UUID_REGEXP,
             "newThread workflow-method",
-            "upsertSearchAttributes",
-            "executeActivity Activity",
-            "activity Activity");
+            "upsertTypedSearchAttributes",
+            "sleep PT0.1S",
+            "upsertTypedSearchAttributes",
+            "sleep PT0.1S",
+            "upsertTypedSearchAttributes",
+            "upsertTypedSearchAttributes",
+            "sleep PT0.1S",
+            "upsertTypedSearchAttributes",
+            "upsertTypedSearchAttributes",
+            "upsertTypedSearchAttributes");
     testWorkflowRule.assertHistoryEvent(
         execution.getWorkflowId(), EventType.EVENT_TYPE_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES);
   }

diff --git a/temporal-testing/src/main/java/io/temporal/testing/internal/SDKTestWorkflowRule.java b/temporal-testing/src/main/java/io/temporal/testing/internal/SDKTestWorkflowRule.java
@@ -232,7 +232,14 @@ public SDKTestWorkflowRule build() {
   }
 
   public Statement apply(@Nonnull Statement base, Description description) {
-    Statement testWorkflowStatement = base;
+    Statement testWorkflowStatement =
+        new Statement() {
+          @Override
+          public void evaluate() throws Throwable {
+            base.evaluate();
+            shutdown();
+          }
+        };
 
     Test annotation = description.getAnnotation(Test.class);
     boolean timeoutIsOverriddenOnTestAnnotation = annotation != null && annotation.timeout() > 0;