Update test server to v1.4.0

.github/workflows/ci.yml

@@ -72,7 +72,7 @@ jobs:
 
     - name: Start containerized server and dependencies
       env:
-        TEMPORAL_CLI_VERSION: 1.3.1-nexus-links.0
+        TEMPORAL_CLI_VERSION: 1.4.0
       run: |
         wget -O temporal_cli.tar.gz https://github.com/temporalio/cli/releases/download/v${TEMPORAL_CLI_VERSION}/temporal_cli_${TEMPORAL_CLI_VERSION}_linux_amd64.tar.gz
         tar -xzf temporal_cli.tar.gz

temporal-sdk/src/test/java/io/temporal/worker/WorkerVersioningTest.java

@@ -1,5 +1,7 @@
 package io.temporal.worker;
 
+import static io.temporal.api.enums.v1.VersioningBehavior.VERSIONING_BEHAVIOR_PINNED;
+import static io.temporal.api.workflow.v1.VersioningOverride.PinnedOverrideBehavior.PINNED_OVERRIDE_BEHAVIOR_PINNED;
 import static org.junit.Assume.assumeTrue;
 
 import com.google.protobuf.ByteString;
@@ -273,8 +275,7 @@ public void testDynamicWorkflow() {
                 e ->
                     e.getEventType() == EventType.EVENT_TYPE_WORKFLOW_TASK_COMPLETED
                         && e.getWorkflowTaskCompletedEventAttributes().getVersioningBehavior()
-                            == io.temporal.api.enums.v1.VersioningBehavior
-                                .VERSIONING_BEHAVIOR_PINNED));
+                            == VERSIONING_BEHAVIOR_PINNED));
   }
 
   public static class TestWorkerVersioningMissingAnnotation extends QueueLoop
@@ -353,8 +354,7 @@ public void testWorkflowsCanUseDefaultVersioningBehaviorWhenSpecified() {
                 e ->
                     e.getEventType() == EventType.EVENT_TYPE_WORKFLOW_TASK_COMPLETED
                         && e.getWorkflowTaskCompletedEventAttributes().getVersioningBehavior()
-                            == io.temporal.api.enums.v1.VersioningBehavior
-                                .VERSIONING_BEHAVIOR_PINNED));
+                            == VERSIONING_BEHAVIOR_PINNED));
   }
 
   @WorkflowInterface
@@ -426,9 +426,9 @@ public void testWorkflowsCanUseVersioningOverride() {
                     e.getEventType() == EventType.EVENT_TYPE_WORKFLOW_EXECUTION_STARTED
                         && e.getWorkflowExecutionStartedEventAttributes()
                                 .getVersioningOverride()
+                                .getPinned()
                                 .getBehavior()
-                            == io.temporal.api.enums.v1.VersioningBehavior
-                                .VERSIONING_BEHAVIOR_PINNED));
+                            == PINNED_OVERRIDE_BEHAVIOR_PINNED));
   }
 
   @SuppressWarnings("deprecation")

temporal-test-server/src/test/java/io/temporal/testserver/functional/DescribeWorkflowExecutionTest.java

@@ -143,7 +143,7 @@ public void testSuccessfulActivity() throws InterruptedException {
     PendingActivityInfo actual = asserter.getActual().getPendingActivities(0);
 
     // No fancy asserter type for PendingActivityInfo... we just build the expected proto
-    PendingActivityInfo expected =
+    PendingActivityInfo.Builder expected =
         PendingActivityInfo.newBuilder()
             .setActivityId(actual.getActivityId())
             .setActivityType(ActivityType.newBuilder().setName("TestDescribeActivity").build())
@@ -160,10 +160,13 @@ public void testSuccessfulActivity() throws InterruptedException {
             // going to run against the real server.
             .setScheduledTime(actual.getScheduledTime())
             .setLastStartedTime(actual.getLastStartedTime())
-            .setExpirationTime(actual.getExpirationTime())
-            .build();
+            .setExpirationTime(actual.getExpirationTime());
 
-    Assert.assertEquals("PendingActivityInfo should match before", expected, actual);
+    if (actual.hasActivityOptions()) {
+      // If the activity options are present, we can assert them
+      expected.setActivityOptions(actual.getActivityOptions());
+    }
+    Assert.assertEquals("PendingActivityInfo should match before", expected.build(), actual);
 
     // Make the activity heartbeat - this should show in the next describe call
     ThreadUtils.waitForWorkflow(token + "-heartbeat");
@@ -181,11 +184,11 @@ public void testSuccessfulActivity() throws InterruptedException {
 
     // Now, our PendingActivityInfo has heartbeat data, but is otherwise unchanged
     expected =
-        expected.toBuilder()
+        expected
             .setHeartbeatDetails(DescribeWorkflowAsserter.stringsToPayloads("heartbeatDetails"))
-            .setLastHeartbeatTime(actual.getLastHeartbeatTime())
-            .build();
-    Assert.assertEquals("PendingActivityInfo should match after heartbeat", expected, actual);
+            .setLastHeartbeatTime(actual.getLastHeartbeatTime());
+    Assert.assertEquals(
+        "PendingActivityInfo should match after heartbeat", expected.build(), actual);
 
     // Let the activity finish, which will let the workflow finish.
     ThreadUtils.waitForWorkflow(token + "-finish");
@@ -241,7 +244,7 @@ public void testFailedActivity() throws InterruptedException {
         "Activity was asked to fail on attempt 1",
         actual.getLastFailure().getMessage());
 
-    PendingActivityInfo expected =
+    PendingActivityInfo.Builder expected =
         PendingActivityInfo.newBuilder()
             .setActivityId(actual.getActivityId())
             .setActivityType(ActivityType.newBuilder().setName("TestDescribeActivity").build())
@@ -258,10 +261,13 @@ public void testFailedActivity() throws InterruptedException {
             // it.
             .setLastWorkerIdentity(actual.getLastWorkerIdentity())
             // We don't deeply assert the failure structure since we asserted the message above
-            .setLastFailure(actual.getLastFailure())
-            .build();
+            .setLastFailure(actual.getLastFailure());
+    if (actual.hasActivityOptions()) {
+      // If the activity options are present, we can assert them
+      expected.setActivityOptions(actual.getActivityOptions());
+    }
 
-    Assert.assertEquals("PendingActivityInfo should match", expected, actual);
+    Assert.assertEquals("PendingActivityInfo should match", expected.build(), actual);
 
     // Now let the workflow succeed
     ThreadUtils.waitForWorkflow(token + "-finish");
@@ -311,7 +317,7 @@ private void testKilledWorkflow(
 
     PendingActivityInfo actual = asserter.getActual().getPendingActivities(0);
 
-    PendingActivityInfo expected =
+    PendingActivityInfo.Builder expected =
         PendingActivityInfo.newBuilder()
             .setActivityId(actual.getActivityId())
             .setActivityType(ActivityType.newBuilder().setName("TestDescribeActivity").build())
@@ -325,10 +331,13 @@ private void testKilledWorkflow(
             .setExpirationTime(actual.getExpirationTime())
             // this ends up being a dummy value, but if it weren't, we still wouldn't expect to know
             // it.
-            .setLastWorkerIdentity(actual.getLastWorkerIdentity())
-            .build();
+            .setLastWorkerIdentity(actual.getLastWorkerIdentity());
+    if (actual.hasActivityOptions()) {
+      // If the activity options are present, we can assert them
+      expected.setActivityOptions(actual.getActivityOptions());
+    }
 
-    Assert.assertEquals("PendingActivityInfo should match", expected, actual);
+    Assert.assertEquals("PendingActivityInfo should match", expected.build(), actual);
   }
 
   @Test