Fix tests

Quinn-With-Two-Ns · Quinn-With-Two-Ns · commit d482995fcb86 · 2025-05-28T13:45:13.000-07:00
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/BaseVersionTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/BaseVersionTest.java
@@ -5,21 +5,19 @@
 import io.temporal.worker.WorkflowImplementationOptions;
 import java.util.Arrays;
 import java.util.Collections;
-import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public abstract class BaseVersionTest {
 
-  @Parameterized.Parameter(0)
   public static boolean setVersioningFlag;
 
   public static boolean upsertVersioningSA = false;
 
   @Parameterized.Parameters()
   public static Object[] data() {
-    return new Object[][] {{true}, {false}};
+    return new Object[][] {{true, true}, {false, true}, {true, false}, {false, false}};
   }
 
   public WorkflowImplementationOptions options;
@@ -30,12 +28,13 @@ public WorkflowImplementationOptions getDefaultWorkflowImplementationOptions() {
         .build();
   }
 
-  @Before
-  public void setup() {
+  public BaseVersionTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
     if (setVersioningFlag) {
       WorkflowStateMachines.initialFlags =
           Collections.unmodifiableList(
               Arrays.asList(SdkFlag.SKIP_YIELD_ON_DEFAULT_VERSION, SdkFlag.SKIP_YIELD_ON_VERSION));
     }
+    this.setVersioningFlag = setVersioningFlag;
+    this.upsertVersioningSA = upsertVersioningSA;
   }
 }
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/DefaultVersionNotSupportedDuringReplayTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/DefaultVersionNotSupportedDuringReplayTest.java
@@ -28,6 +28,11 @@ public class DefaultVersionNotSupportedDuringReplayTest extends BaseVersionTest
               getDefaultWorkflowImplementationOptions(), TestVersionNotSupportedWorkflowImpl.class)
           .build();
 
+  public DefaultVersionNotSupportedDuringReplayTest(
+      boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testVersionNotSupported() throws InterruptedException {
     TestWorkflowReturnString workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAddNewBeforeTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAddNewBeforeTest.java
@@ -31,6 +31,10 @@ public class GetVersionAddNewBeforeTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionAddNewBeforeTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionAddNewBefore() {
     assumeFalse("skipping for docker tests", SDKTestWorkflowRule.useExternalService);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAfterScopeCancellationInMainWorkflowMethodTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAfterScopeCancellationInMainWorkflowMethodTest.java
@@ -23,6 +23,11 @@ public class GetVersionAfterScopeCancellationInMainWorkflowMethodTest extends Ba
           .setWorkflowTypes(getDefaultWorkflowImplementationOptions(), WorkflowImpl.class)
           .build();
 
+  public GetVersionAfterScopeCancellationInMainWorkflowMethodTest(
+      boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   public static final class WorkflowImpl implements TestWorkflows.NoArgsWorkflow {
 
     @Override
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAfterScopeCancellationTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAfterScopeCancellationTest.java
@@ -31,6 +31,11 @@ public class GetVersionAfterScopeCancellationTest extends BaseVersionTest {
           .setWorkerOptions(WorkerOptions.newBuilder().build())
           .build();
 
+  public GetVersionAfterScopeCancellationTest(
+      boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionAndCancelTimer() {
     ReminderWorkflow workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAndTimerTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionAndTimerTest.java
@@ -26,6 +26,10 @@ public class GetVersionAndTimerTest extends BaseVersionTest {
   public SDKTestWorkflowRule testWorkflowRuleWithVersion =
       SDKTestWorkflowRule.newBuilder().setWorkflowTypes(TimedWorkflowWithVersionImpl.class).build();
 
+  public GetVersionAndTimerTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testTimedWorkflowWithoutVersionImpl() {
     assumeFalse("skipping for docker tests", SDKTestWorkflowRule.useExternalService);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionDefaultInSignalTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionDefaultInSignalTest.java
@@ -30,6 +30,10 @@ public class GetVersionDefaultInSignalTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionDefaultInSignalTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionDefaultInSignal() {
     TestWorkflows.TestSignaledWorkflow workflow =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionInSignalOnReplayTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionInSignalOnReplayTest.java
@@ -32,6 +32,10 @@ public class GetVersionInSignalOnReplayTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionInSignalOnReplayTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionInSignal() {
     TestWorkflows.TestSignaledWorkflow workflow =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionInSignalTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionInSignalTest.java
@@ -21,6 +21,10 @@ public class GetVersionInSignalTest extends BaseVersionTest {
           .setWorkflowTypes(getDefaultWorkflowImplementationOptions(), TestGetVersionInSignal.class)
           .build();
 
+  public GetVersionInSignalTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionInSignal() {
     TestWorkflows.TestSignaledWorkflow workflow =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultipleCallsDefaultTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultipleCallsDefaultTest.java
@@ -29,6 +29,10 @@ public class GetVersionMultipleCallsDefaultTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionMultipleCallsDefaultTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionMultipleCallsDefault() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultipleCallsInSignalTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultipleCallsInSignalTest.java
@@ -45,6 +45,11 @@ public class GetVersionMultipleCallsInSignalTest extends BaseVersionTest {
           .setWorkflowTypes(getDefaultWorkflowImplementationOptions(), TestGetVersionInSignal.class)
           .build();
 
+  public GetVersionMultipleCallsInSignalTest(
+      boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testMultipleLargeGetVersionInSignals() {
     TestSignaledWorkflow workflow =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultipleCallsTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultipleCallsTest.java
@@ -28,6 +28,10 @@ public class GetVersionMultipleCallsTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionMultipleCallsTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionMultipleCalls() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultithreadingRemoveTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultithreadingRemoveTest.java
@@ -35,6 +35,10 @@ public class GetVersionMultithreadingRemoveTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionMultithreadingRemoveTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionMultithreadingRemoval() {
     assumeTrue("This test only passes if SKIP_YIELD_ON_VERSION is enabled", setVersioningFlag);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultithreadingTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionMultithreadingTest.java
@@ -34,6 +34,10 @@ public class GetVersionMultithreadingTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionMultithreadingTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionDefaultMultithreading() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionOutOfOrderFailTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionOutOfOrderFailTest.java
@@ -43,6 +43,10 @@ public class GetVersionOutOfOrderFailTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionOutOfOrderFailTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionOutOfOrderFail() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionRemovalBeforeMarkerTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionRemovalBeforeMarkerTest.java
@@ -30,6 +30,10 @@ public class GetVersionRemovalBeforeMarkerTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionRemovalBeforeMarkerTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testSideEffectAfterGetVersion() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionRemovedBeforeTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionRemovedBeforeTest.java
@@ -33,6 +33,10 @@ public class GetVersionRemovedBeforeTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionRemovedBeforeTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionRemovedBefore() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionRemovedInReplayTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionRemovedInReplayTest.java
@@ -34,6 +34,10 @@ public class GetVersionRemovedInReplayTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionRemovedInReplayTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionRemovedInReplay() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionSameIdOnReplayTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionSameIdOnReplayTest.java
@@ -32,6 +32,10 @@ public class GetVersionSameIdOnReplayTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionSameIdOnReplayTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionSameIdOnReplay() {
     assumeFalse("skipping for docker tests", SDKTestWorkflowRule.useExternalService);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionSameIdTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionSameIdTest.java
@@ -28,6 +28,10 @@ public class GetVersionSameIdTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionSameIdTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionSameId() {
     assumeFalse("skipping for docker tests", SDKTestWorkflowRule.useExternalService);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionTest.java
@@ -37,6 +37,10 @@ public class GetVersionTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersion() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionUpsertSATest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionUpsertSATest.java
@@ -57,6 +57,10 @@ public class GetVersionUpsertSATest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionUpsertSATest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersion() {
     TestWorkflow1 workflowStub =
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWithoutCommandEventTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWithoutCommandEventTest.java
@@ -35,6 +35,10 @@ public class GetVersionWithoutCommandEventTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionWithoutCommandEventTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionWithoutCommandEvent() throws Exception {
     executionStarted = new CompletableFuture<Boolean>();
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWorkflowRemoveTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWorkflowRemoveTest.java
@@ -36,6 +36,10 @@ public class GetVersionWorkflowRemoveTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionWorkflowRemoveTest(boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionWorkflowRemove() {
     assumeFalse("skipping for docker tests", SDKTestWorkflowRule.useExternalService);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWorkflowReplaceCompletelyTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWorkflowReplaceCompletelyTest.java
@@ -37,6 +37,11 @@ public class GetVersionWorkflowReplaceCompletelyTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionWorkflowReplaceCompletelyTest(
+      boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionWorkflowReplaceCompletely() {
     assumeFalse("skipping for docker tests", SDKTestWorkflowRule.useExternalService);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWorkflowReplaceGetVersionIdTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/GetVersionWorkflowReplaceGetVersionIdTest.java
@@ -37,6 +37,11 @@ public class GetVersionWorkflowReplaceGetVersionIdTest extends BaseVersionTest {
                   .build())
           .build();
 
+  public GetVersionWorkflowReplaceGetVersionIdTest(
+      boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testGetVersionWorkflowReplaceGetVersionId() {
     assumeFalse("skipping for docker tests", SDKTestWorkflowRule.useExternalService);
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/VersionNotSupportedWithConflictingRangesExecutionTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/versionTests/VersionNotSupportedWithConflictingRangesExecutionTest.java
@@ -40,6 +40,11 @@ public class VersionNotSupportedWithConflictingRangesExecutionTest extends BaseV
                   .build())
           .build();
 
+  public VersionNotSupportedWithConflictingRangesExecutionTest(
+      boolean setVersioningFlag, boolean upsertVersioningSA) {
+    super(setVersioningFlag, upsertVersioningSA);
+  }
+
   @Test
   public void testVersionNotSupported() {
     TestWorkflow1 workflowStub =
