Add more tests

Author: Quinn-With-Two-Ns

temporal-sdk/src/test/java/io/temporal/client/functional/WorkflowStubFirstExecutionRunIdTest.java

@@ -1,5 +1,6 @@
 package io.temporal.client.functional;
 
+import io.temporal.api.enums.v1.EventType;
 import io.temporal.client.*;
 import io.temporal.testing.internal.SDKTestWorkflowRule;
 import io.temporal.workflow.Workflow;
@@ -12,10 +13,7 @@
 public class WorkflowStubFirstExecutionRunIdTest {
   @Rule
   public SDKTestWorkflowRule testWorkflowRule =
-      SDKTestWorkflowRule.newBuilder()
-          .setUseExternalService(true)
-          .setWorkflowTypes(AwaitingWorkflow.class)
-          .build();
+      SDKTestWorkflowRule.newBuilder().setWorkflowTypes(AwaitingWorkflow.class).build();
 
   @Test
   public void terminateFollowFirstRunId() throws InterruptedException {
@@ -52,6 +50,73 @@ public void terminateFollowFirstRunId() throws InterruptedException {
         () -> untyped.getResult(String.class));
   }
 
+  @Test
+  public void cancelFollowFirstRunId() throws InterruptedException {
+    TestWorkflows.TestWorkflow1 workflow =
+        testWorkflowRule.newWorkflowStub(TestWorkflows.TestWorkflow1.class);
+    WorkflowClient.start(workflow::execute, "input1");
+    WorkflowStub untyped = WorkflowStub.fromTyped(workflow);
+    // TODO wait for the continue as new to be visible
+    Thread.sleep(1000);
+    testWorkflowRule
+        .getWorkflowClient()
+        .newUntypedWorkflowStub(
+            Optional.empty(),
+            WorkflowTargetOptions.newBuilder().setWorkflowExecution(untyped.getExecution()).build())
+        .cancel();
+    testWorkflowRule.assertNoHistoryEvent(
+        untyped.getExecution().getWorkflowId(),
+        untyped.getExecution().getRunId(),
+        EventType.EVENT_TYPE_WORKFLOW_EXECUTION_CANCEL_REQUESTED);
+
+    testWorkflowRule
+        .getWorkflowClient()
+        .newUntypedWorkflowStub(
+            Optional.empty(),
+            WorkflowTargetOptions.newBuilder()
+                .setWorkflowExecution(untyped.getExecution())
+                .setFirstExecutionRunId(untyped.getExecution().getRunId())
+                .build())
+        .cancel();
+    Assert.assertThrows(
+        "Workflow should be cancelled",
+        WorkflowFailedException.class,
+        () -> untyped.getResult(String.class));
+    testWorkflowRule.assertHistoryEvent(
+        untyped.getExecution().getWorkflowId(),
+        EventType.EVENT_TYPE_WORKFLOW_EXECUTION_CANCEL_REQUESTED);
+  }
+
+  @Test
+  public void signalRespectRunId() throws InterruptedException {
+    TestWorkflows.TestWorkflow1 workflow =
+        testWorkflowRule.newWorkflowStub(TestWorkflows.TestWorkflow1.class);
+    WorkflowClient.start(workflow::execute, "input1");
+    WorkflowStub untyped = WorkflowStub.fromTyped(workflow);
+    // TODO wait for the continue as new to be visible
+    Thread.sleep(1000);
+    Assert.assertThrows(
+        WorkflowNotFoundException.class,
+        () ->
+            testWorkflowRule
+                .getWorkflowClient()
+                .newUntypedWorkflowStub(
+                    Optional.empty(),
+                    WorkflowTargetOptions.newBuilder()
+                        .setWorkflowExecution(untyped.getExecution())
+                        .build())
+                .signal("signal"));
+
+    testWorkflowRule
+        .getWorkflowClient()
+        .newUntypedWorkflowStub(
+            Optional.empty(),
+            WorkflowTargetOptions.newBuilder()
+                .setWorkflowId(untyped.getExecution().getWorkflowId())
+                .build())
+        .signal("signal");
+  }
+
   public static class AwaitingWorkflow implements TestWorkflows.TestWorkflow1 {
 
     @Override

temporal-testing/src/main/java/io/temporal/testing/internal/SDKTestWorkflowRule.java

@@ -293,6 +293,10 @@ public WorkflowExecutionHistory getExecutionHistory(String workflowId) {
     return testWorkflowRule.getWorkflowClient().fetchHistory(workflowId);
   }
 
+  public WorkflowExecutionHistory getExecutionHistory(String workflowId, String runId) {
+    return testWorkflowRule.getWorkflowClient().fetchHistory(workflowId, runId);
+  }
+
   /** Returns list of all events of the given EventType found in the history. */
   public List<HistoryEvent> getHistoryEvents(String workflowId, EventType eventType) {
     List<HistoryEvent> result = new ArrayList<>();
@@ -318,7 +322,11 @@ public HistoryEvent getHistoryEvent(String workflowId, EventType eventType) {
 
   /** Asserts that an event of the given EventType is found in the history. */
   public void assertHistoryEvent(String workflowId, EventType eventType) {
-    History history = getExecutionHistory(workflowId).getHistory();
+    assertHistoryEvent(workflowId, null, eventType);
+  }
+
+  public void assertHistoryEvent(String workflowId, String runId, EventType eventType) {
+    History history = getExecutionHistory(workflowId, runId).getHistory();
     for (HistoryEvent event : history.getEventsList()) {
       if (eventType == event.getEventType()) {
         return;
@@ -329,7 +337,12 @@ public void assertHistoryEvent(String workflowId, EventType eventType) {
 
   /** Asserts that an event of the given EventType is not found in the history. */
   public void assertNoHistoryEvent(String workflowId, EventType eventType) {
-    History history = getExecutionHistory(workflowId).getHistory();
+    assertNoHistoryEvent(workflowId, null, eventType);
+  }
+
+  /** Asserts that an event of the given EventType is not found in the history. */
+  public void assertNoHistoryEvent(String workflowId, String runId, EventType eventType) {
+    History history = getExecutionHistory(workflowId, runId).getHistory();
     assertNoHistoryEvent(history, eventType);
   }