Adapt tests to send status

restatedev · May 28, 2024 · 0605bfc · 0605bfc
1 parent 1ce867b
commit 0605bfc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 33 deletions.
diff --git a/tests/src/test/kotlin/dev/restate/e2e/CancelInvocationTest.kt b/tests/src/test/kotlin/dev/restate/e2e/CancelInvocationTest.kt
@@ -74,7 +74,7 @@ abstract class BaseCancelInvocationTest {
     val cancelTestClient = CancelTestRunnerClient.fromIngress(ingressClient, key)
     val blockingServiceClient = CancelTestBlockingServiceClient.fromIngress(ingressClient, key)
 
-    val id = cancelTestClient.send().startTest(blockingOperation)
+    val id = cancelTestClient.send().startTest(blockingOperation).invocationId
 
     val awakeableHolderClient = AwakeableHolderClient.fromIngress(ingressClient, "cancel")
 

diff --git a/tests/src/test/kotlin/dev/restate/e2e/WorkflowAPITest.kt b/tests/src/test/kotlin/dev/restate/e2e/WorkflowAPITest.kt
@@ -13,6 +13,7 @@ import dev.restate.e2e.utils.InjectIngressClient
 import dev.restate.e2e.utils.RestateDeployer
 import dev.restate.e2e.utils.RestateDeployerExtension
 import dev.restate.sdk.client.IngressClient
+import dev.restate.sdk.client.SendResponse.SendStatus
 import java.util.*
 import my.restate.e2e.services.WorkflowAPIBlockAndWaitClient
 import org.assertj.core.api.Assertions.assertThat
@@ -27,7 +28,7 @@ import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
 
 @Tag("always-suspending")
-class JavaWorkflowAPITest {
+class JavaWorkflowAPITest : BaseWorkflowAPITest() {
 
   companion object {
     @RegisterExtension
@@ -37,32 +38,10 @@ class JavaWorkflowAPITest {
                 .withServiceEndpoint(Containers.JAVA_WORKFLOW_SERVICE_SPEC)
                 .build())
   }
-
-  @Test
-  @DisplayName("Set and resolve durable promise leads to completion")
-  @Execution(ExecutionMode.CONCURRENT)
-  fun setAndResolve(@InjectIngressClient ingressClient: IngressClient) {
-    val client =
-        WorkflowAPIBlockAndWaitClient.fromIngress(ingressClient, UUID.randomUUID().toString())
-    val handle = client.submit("Francesco")
-
-    // Wait state is set
-    await untilCallTo { client.getState() } matches { it!!.isPresent }
-
-    client.unblock("Till")
-
-    assertThat(handle.attach()).isEqualTo("Till")
-
-    // Can call get output again
-    assertThat(handle.output).isEqualTo("Till")
-
-    // Re-submit should have no effect
-    assertThat(client.submit("Francesco").output).isEqualTo("Till")
-  }
 }
 
 @Tag("always-suspending")
-class NodeWorkflowAPITest {
+class NodeWorkflowAPITest : BaseWorkflowAPITest() {
 
   companion object {
     @RegisterExtension
@@ -72,27 +51,33 @@ class NodeWorkflowAPITest {
                 .withServiceEndpoint(Containers.NODE_WORKFLOW_SERVICE_SPEC)
                 .build())
   }
+}
 
+abstract class BaseWorkflowAPITest {
   @Test
   @DisplayName("Set and resolve durable promise leads to completion")
   @Execution(ExecutionMode.CONCURRENT)
   fun setAndResolve(@InjectIngressClient ingressClient: IngressClient) {
     val client =
         WorkflowAPIBlockAndWaitClient.fromIngress(ingressClient, UUID.randomUUID().toString())
 
-    val handle = client.submit("Francesco")
+    val sendResponse = client.submit("Francesco")
+    assertThat(sendResponse.status).isEqualTo(SendStatus.ACCEPTED)
 
     // Wait state is set
     await untilCallTo { client.getState() } matches { it!!.isPresent }
 
     client.unblock("Till")
 
-    assertThat(handle.attach()).isEqualTo("Till")
+    assertThat(client.workflowHandle().attach()).isEqualTo("Till")
 
     // Can call get output again
-    assertThat(handle.output).isEqualTo("Till")
+    assertThat(client.workflowHandle().output).isEqualTo("Till")
 
     // Re-submit should have no effect
-    assertThat(client.submit("Francesco").output).isEqualTo("Till")
+    val secondSendResponse = client.submit("Francesco")
+    assertThat(secondSendResponse.status).isEqualTo(SendStatus.PREVIOUSLY_ACCEPTED)
+    assertThat(secondSendResponse.invocationId).isEqualTo(sendResponse.invocationId)
+    assertThat(client.workflowHandle().output).isEqualTo("Till")
   }
 }
diff --git a/tests/src/test/kotlin/dev/restate/e2e/runtime/IngressTest.kt b/tests/src/test/kotlin/dev/restate/e2e/runtime/IngressTest.kt
@@ -21,6 +21,7 @@ import dev.restate.sdk.JsonSerdes
 import dev.restate.sdk.client.CallRequestOptions
 import dev.restate.sdk.client.IngressClient
 import dev.restate.sdk.client.IngressException
+import dev.restate.sdk.client.SendResponse.SendStatus
 import java.net.URL
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -139,11 +140,15 @@ class IngressTest {
     val counterClient = CounterClient.fromIngress(ingressClient, counterRandomName)
 
     // Send request twice
-    val firstInvocationId = counterClient.send().add(2, requestOptions)
-    val secondInvocationId = counterClient.send().add(2, requestOptions)
+    val firstInvocationSendStatus = counterClient.send().add(2, requestOptions)
+    assertThat(firstInvocationSendStatus.status).isEqualTo(SendStatus.ACCEPTED)
+    val secondInvocationSendStatus = counterClient.send().add(2, requestOptions)
+    assertThat(secondInvocationSendStatus.status).isEqualTo(SendStatus.PREVIOUSLY_ACCEPTED)
 
     // IDs should be the same
-    assertThat(firstInvocationId).startsWith("inv").isEqualTo(secondInvocationId)
+    assertThat(firstInvocationSendStatus.invocationId)
+        .startsWith("inv")
+        .isEqualTo(secondInvocationSendStatus.invocationId)
 
     // Wait for get
     await untilAsserted { assertThat(counterClient.get()).isEqualTo(2) }
@@ -169,6 +174,7 @@ class IngressTest {
         echoClient
             .send()
             .blockThenEcho(awakeableKey, CallRequestOptions().withIdempotency(myIdempotencyId))
+            .invocationId
     val invocationHandle = ingressClient.invocationHandle(invocationId, JsonSerdes.STRING)
 
     // Attach to request

diff --git a/tests/src/test/kotlin/dev/restate/e2e/runtime/KillTestInvocationTest.kt b/tests/src/test/kotlin/dev/restate/e2e/runtime/KillTestInvocationTest.kt
@@ -40,7 +40,7 @@ class KillTestInvocationTest {
 
   @Test
   fun kill(@InjectIngressClient ingressClient: IngressClient, @InjectMetaURL metaURL: URL) {
-    val id = KillTestRunnerClient.fromIngress(ingressClient).send().startCallTree()
+    val id = KillTestRunnerClient.fromIngress(ingressClient).send().startCallTree().invocationId
     val awakeableHolderClient = AwakeableHolderClient.fromIngress(ingressClient, "kill")
 
     // Await until AwakeableHolder has an awakeable and then complete it.