Address review comments

Author: bergundy

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

@@ -807,20 +807,6 @@ private static void timeoutNexusOperation(
           "Timeout type not supported for Nexus operations: " + timeoutType);
     }
 
-    String timeoutMessage;
-    switch (timeoutType) {
-      case TIMEOUT_TYPE_SCHEDULE_TO_START:
-        timeoutMessage = "operation timed out before starting";
-        break;
-      case TIMEOUT_TYPE_START_TO_CLOSE:
-        timeoutMessage = "operation timed out after starting";
-        break;
-      case TIMEOUT_TYPE_SCHEDULE_TO_CLOSE:
-      default:
-        timeoutMessage = "operation timed out";
-        break;
-    }
-
     Failure failure =
         Failure.newBuilder()
             .setMessage("nexus operation completed unsuccessfully")
@@ -833,7 +819,7 @@ private static void timeoutNexusOperation(
                     .setScheduledEventId(data.scheduledEventId))
             .setCause(
                 Failure.newBuilder()
-                    .setMessage(timeoutMessage)
+                    .setMessage("operation timed out")
                     .setTimeoutFailureInfo(
                         TimeoutFailureInfo.newBuilder().setTimeoutType(timeoutType)))
             .build();

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

@@ -25,6 +25,7 @@
 import io.temporal.internal.testservice.NexusTaskToken;
 import io.temporal.testing.internal.SDKTestWorkflowRule;
 import io.temporal.testserver.functional.common.TestWorkflows;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -745,7 +746,7 @@ public void testNexusOperationScheduleToStartTimeout() {
       Assert.assertTrue("OPERATION_TIMEOUT should be positive", operationTimeoutMs > 0);
 
       // Sleep longer than schedule-to-start timeout to trigger the timeout
-      Thread.sleep(2000);
+      testWorkflowRule.sleep(Duration.ofSeconds(2);)
     } catch (Exception e) {
       Assert.fail(e.getMessage());
     }
@@ -763,7 +764,7 @@ public void testNexusOperationScheduleToStartTimeout() {
     assertOperationFailureInfo(failure.getNexusOperationExecutionFailureInfo());
     Assert.assertEquals("nexus operation completed unsuccessfully", failure.getMessage());
     io.temporal.api.failure.v1.Failure cause = failure.getCause();
-    Assert.assertEquals("operation timed out before starting", cause.getMessage());
+    Assert.assertEquals("operation timed out", cause.getMessage());
     Assert.assertTrue(cause.hasTimeoutFailureInfo());
     Assert.assertEquals(
         TimeoutType.TIMEOUT_TYPE_SCHEDULE_TO_START, cause.getTimeoutFailureInfo().getTimeoutType());
@@ -833,7 +834,7 @@ public void testNexusOperationStartToCloseTimeout() {
       assertOperationFailureInfo(operationId, failure.getNexusOperationExecutionFailureInfo());
       Assert.assertEquals("nexus operation completed unsuccessfully", failure.getMessage());
       io.temporal.api.failure.v1.Failure cause = failure.getCause();
-      Assert.assertEquals("operation timed out after starting", cause.getMessage());
+      Assert.assertEquals("operation timed out", cause.getMessage());
       Assert.assertTrue(cause.hasTimeoutFailureInfo());
       Assert.assertEquals(
           TimeoutType.TIMEOUT_TYPE_START_TO_CLOSE, cause.getTimeoutFailureInfo().getTimeoutType());