Fix tests for Temporal Server 1.31.0 behavior changes

Activity timeout tests now expect RETRY_STATE_TIMEOUT unconditionally,
matching the server fix for temporalio/temporal#3667. GrpcMessageTooLarge
tests expect TerminatedFailure with FORCE_CLOSE_COMMAND cause instead of
TimeoutFailure. Updated test server to terminate workflows on
GRPC_MESSAGE_TOO_LARGE failures, aligning with real server behavior.

Author: bergundy

temporal-sdk/src/test/java/io/temporal/workflow/GrpcMessageTooLargeTest.java

@@ -9,7 +9,7 @@
 import io.temporal.api.history.v1.HistoryEvent;
 import io.temporal.client.*;
 import io.temporal.failure.ApplicationFailure;
-import io.temporal.failure.TimeoutFailure;
+import io.temporal.failure.TerminatedFailure;
 import io.temporal.internal.replay.ReplayWorkflowTaskHandler;
 import io.temporal.internal.retryer.GrpcMessageTooLargeException;
 import io.temporal.internal.worker.PollerOptions;
@@ -71,7 +71,7 @@ public void activityStartTooLarge() {
 
     WorkflowFailedException e =
         assertThrows(WorkflowFailedException.class, () -> workflow.execute(""));
-    assertTrue(e.getCause() instanceof TimeoutFailure);
+    assertTrue(e.getCause() instanceof TerminatedFailure);
 
     String workflowId = WorkflowStub.fromTyped(workflow).getExecution().getWorkflowId();
     assertTrue(
@@ -83,7 +83,7 @@ public void activityStartTooLarge() {
             workflowId, EventType.EVENT_TYPE_WORKFLOW_TASK_FAILED);
     assertEquals(1, events.size());
     assertEquals(
-        WorkflowTaskFailedCause.WORKFLOW_TASK_FAILED_CAUSE_GRPC_MESSAGE_TOO_LARGE,
+        WorkflowTaskFailedCause.WORKFLOW_TASK_FAILED_CAUSE_FORCE_CLOSE_COMMAND,
         events.get(0).getWorkflowTaskFailedEventAttributes().getCause());
   }
 
@@ -97,14 +97,14 @@ public void workflowFailureTooLarge() {
       WorkflowFailedException e =
           assertThrows(WorkflowFailedException.class, () -> workflow.execute(""));
 
-      assertTrue(e.getCause() instanceof TimeoutFailure);
+      assertTrue(e.getCause() instanceof TerminatedFailure);
       String workflowId = WorkflowStub.fromTyped(workflow).getExecution().getWorkflowId();
       List<HistoryEvent> events =
           failureWorkflowRule.getHistoryEvents(
               workflowId, EventType.EVENT_TYPE_WORKFLOW_TASK_FAILED);
       assertEquals(1, events.size());
       assertEquals(
-          WorkflowTaskFailedCause.WORKFLOW_TASK_FAILED_CAUSE_GRPC_MESSAGE_TOO_LARGE,
+          WorkflowTaskFailedCause.WORKFLOW_TASK_FAILED_CAUSE_FORCE_CLOSE_COMMAND,
           events.get(0).getWorkflowTaskFailedEventAttributes().getCause());
     }
   }

temporal-sdk/src/test/java/io/temporal/workflow/activityTests/ActivityTimeoutTest.java

@@ -15,7 +15,6 @@
 import io.temporal.failure.ActivityFailure;
 import io.temporal.failure.ApplicationFailure;
 import io.temporal.failure.TimeoutFailure;
-import io.temporal.testing.internal.ExternalServiceTestConfigurator;
 import io.temporal.testing.internal.SDKTestWorkflowRule;
 import io.temporal.worker.Worker;
 import io.temporal.worker.WorkerOptions;
@@ -294,12 +293,7 @@ public void scheduleToStartTimeout(boolean local) throws InterruptedException {
 
     MatcherAssert.assertThat(
         activityFailure.getMessage(), CoreMatchers.containsString("Activity task timed out"));
-    if (ExternalServiceTestConfigurator.isUseExternalService() && !local) {
-      // https://github.com/temporalio/temporal/issues/3667
-      assertEquals(RetryState.RETRY_STATE_NON_RETRYABLE_FAILURE, activityFailure.getRetryState());
-    } else {
-      assertEquals(RetryState.RETRY_STATE_TIMEOUT, activityFailure.getRetryState());
-    }
+    assertEquals(RetryState.RETRY_STATE_TIMEOUT, activityFailure.getRetryState());
 
     assertTrue(activityFailure.getCause() instanceof TimeoutFailure);
     assertEquals(
@@ -567,12 +561,7 @@ public void scheduleToCloseTimeout_timingOutActivity(boolean local) {
     assertTrue(e.getCause() instanceof ActivityFailure);
     ActivityFailure activityFailure = (ActivityFailure) e.getCause();
 
-    if (ExternalServiceTestConfigurator.isUseExternalService() && !local) {
-      // https://github.com/temporalio/temporal/issues/3667
-      assertEquals(RetryState.RETRY_STATE_NON_RETRYABLE_FAILURE, activityFailure.getRetryState());
-    } else {
-      assertEquals(RetryState.RETRY_STATE_TIMEOUT, activityFailure.getRetryState());
-    }
+    assertEquals(RetryState.RETRY_STATE_TIMEOUT, activityFailure.getRetryState());
 
     MatcherAssert.assertThat(
         activityFailure.getMessage(), CoreMatchers.containsString("Activity task timed out"));
@@ -618,12 +607,7 @@ public void scheduleToCloseTimeout_failing_timingOutActivity(boolean local) {
     assertTrue(e.getCause() instanceof ActivityFailure);
     ActivityFailure activityFailure = (ActivityFailure) e.getCause();
 
-    if (ExternalServiceTestConfigurator.isUseExternalService() && !local) {
-      // https://github.com/temporalio/temporal/issues/3667
-      assertEquals(RetryState.RETRY_STATE_NON_RETRYABLE_FAILURE, activityFailure.getRetryState());
-    } else {
-      assertEquals(RetryState.RETRY_STATE_TIMEOUT, activityFailure.getRetryState());
-    }
+    assertEquals(RetryState.RETRY_STATE_TIMEOUT, activityFailure.getRetryState());
 
     MatcherAssert.assertThat(
         activityFailure.getMessage(), CoreMatchers.containsString("Activity task timed out"));

temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java

@@ -1288,12 +1288,34 @@ private void processFailWorkflowTask(
       // server drops failures after the second attempt and let the workflow task timeout
       return;
     }
+    boolean isGrpcMessageTooLarge =
+        request.getCause()
+            == WorkflowTaskFailedCause.WORKFLOW_TASK_FAILED_CAUSE_GRPC_MESSAGE_TOO_LARGE;
+    if (isGrpcMessageTooLarge) {
+      // The real server records a FORCE_CLOSE_COMMAND cause and terminates the workflow
+      request =
+          request.toBuilder()
+              .setCause(WorkflowTaskFailedCause.WORKFLOW_TASK_FAILED_CAUSE_FORCE_CLOSE_COMMAND)
+              .build();
+    }
     workflowTaskStateMachine.action(Action.FAIL, ctx, request, 0);
     for (RequestContext deferredCtx : workflowTaskStateMachine.getData().bufferedEvents) {
       ctx.add(deferredCtx);
     }
     workflowTaskStateMachine.getData().bufferedEvents.clear();
-    scheduleWorkflowTask(ctx);
+    if (isGrpcMessageTooLarge) {
+      workflow.action(
+          Action.TERMINATE,
+          ctx,
+          TerminateWorkflowExecutionRequest.newBuilder()
+              .setReason("GrpcMessageTooLarge")
+              .build(),
+          0);
+      workflowTaskStateMachine.getData().workflowCompleted = true;
+      processWorkflowCompletionCallbacks(ctx);
+    } else {
+      scheduleWorkflowTask(ctx);
+    }
     ctx.unlockTimer("failWorkflowTask"); // Unlock timer associated with the workflow task
   }