Fix InvokeOrderingTest (#158)

Also add listName argument (this might help in future with parallel tests)
restatedev · Jun 27, 2023 · 53b2bf2 · 53b2bf2
1 parent c7fde35
commit 53b2bf2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/contracts/src/main/proto/coordinator.proto b/contracts/src/main/proto/coordinator.proto
@@ -46,4 +46,5 @@ message TimeoutResponse {
 
 message InvokeSequentiallyRequest {
   repeated bool execute_as_background_call = 1;
+  string list_name = 2;
 }
diff --git a/.../java-services/src/main/java/dev/restate/e2e/services/coordinator/CoordinatorService.java b/.../java-services/src/main/java/dev/restate/e2e/services/coordinator/CoordinatorService.java
@@ -119,21 +119,15 @@ public void invokeSequentially(
     List<Awaitable<?>> collectedAwaitables = new ArrayList<>();
 
     for (int i = 0; i < request.getExecuteAsBackgroundCallCount(); i++) {
+      var appendRequest =
+          AppendRequest.newBuilder()
+              .setListName(request.getListName())
+              .setValue(String.valueOf(i))
+              .build();
       if (request.getExecuteAsBackgroundCall(i)) {
-        ctx.backgroundCall(
-            ListServiceGrpc.getAppendMethod(),
-            AppendRequest.newBuilder()
-                .setListName("invokeSequentially")
-                .setValue(String.valueOf(i))
-                .build());
+        ctx.backgroundCall(ListServiceGrpc.getAppendMethod(), appendRequest);
       } else {
-        collectedAwaitables.add(
-            ctx.call(
-                ListServiceGrpc.getAppendMethod(),
-                AppendRequest.newBuilder()
-                    .setListName("invokeSequentially")
-                    .setValue(String.valueOf(i))
-                    .build()));
+        collectedAwaitables.add(ctx.call(ListServiceGrpc.getAppendMethod(), appendRequest));
       }
     }
 

diff --git a/tests/src/test/kotlin/dev/restate/e2e/runtime/InvokeOrderingTest.kt b/tests/src/test/kotlin/dev/restate/e2e/runtime/InvokeOrderingTest.kt
@@ -8,6 +8,7 @@ import dev.restate.e2e.services.coordinator.CoordinatorProto.InvokeSequentiallyR
 import dev.restate.e2e.utils.InjectBlockingStub
 import dev.restate.e2e.utils.RestateDeployer
 import dev.restate.e2e.utils.RestateDeployerExtension
+import java.util.UUID
 import java.util.stream.Stream
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.extension.RegisterExtension
@@ -29,9 +30,14 @@ class InvokeOrderingTest {
 
     @JvmStatic
     fun ordering(): Stream<Arguments> {
+      // To enforce ordering wrt listClient.clear(...) executed in the test code,
+      // the last call must be sync!
       return Stream.of(
-          Arguments.of(booleanArrayOf(true, false, true)),
-          Arguments.of(booleanArrayOf(false, true, false)))
+          Arguments.of(booleanArrayOf(true, false, false)),
+          Arguments.of(booleanArrayOf(false, true, false)),
+          Arguments.of(
+              booleanArrayOf(true, true, false),
+          ))
     }
   }
 
@@ -42,12 +48,15 @@ class InvokeOrderingTest {
       @InjectBlockingStub coordinatorClient: CoordinatorBlockingStub,
       @InjectBlockingStub listClient: ListServiceBlockingStub
   ) {
+    val listName = UUID.randomUUID().toString()
+
     coordinatorClient.invokeSequentially(
         InvokeSequentiallyRequest.newBuilder()
             .addAllExecuteAsBackgroundCall(ordering.asIterable())
+            .setListName(listName)
             .build())
 
-    val listClientRequest = Request.newBuilder().setListName("invokeSequentially").build()
+    val listClientRequest = Request.newBuilder().setListName(listName).build()
 
     assertThat(listClient.clear(listClientRequest).valuesList).containsExactly("0", "1", "2")
   }