Revert "Trying to avoid flaky test on PojoServiceIt"

This reverts commit 8a6a38a.

Author: fjtirado

quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/PojoServiceIT.java

@@ -150,22 +150,21 @@ void testTypesPojo() throws Exception {
     }
 
     private void doIt(String flowName) throws Exception {
+        Map<String, Object> body = new HashMap<>();
+        body.put("name", "javierito");
+        body.put("age", 666);
+        given()
+                .contentType(ContentType.JSON)
+                .when()
+                .body(Collections.singletonMap("workflowdata", body))
+                .post("/" + flowName)
+                .then()
+                .statusCode(201)
+                .body("id", notNullValue())
+                .body("workflowdata.name", is("javieritoPerson"))
+                .body("workflowdata.age", nullValue());
         JsonPath processInstanceEventContent = waitForKogitoProcessInstanceEvent(kafkaClient, ProcessInstanceVariableDataEvent.class,
-                e -> flowName.equals(e.get("kogitoprocid")) && "workflowdata".equals(e.get("data.variableName")), true, () -> {
-                    Map<String, Object> body = new HashMap<>();
-                    body.put("name", "javierito");
-                    body.put("age", 666);
-                    given()
-                            .contentType(ContentType.JSON)
-                            .when()
-                            .body(Collections.singletonMap("workflowdata", body))
-                            .post("/" + flowName)
-                            .then()
-                            .statusCode(201)
-                            .body("id", notNullValue())
-                            .body("workflowdata.name", is("javieritoPerson"))
-                            .body("workflowdata.age", nullValue());
-                });
+                e -> flowName.equals(e.get("kogitoprocid")) && "workflowdata".equals(e.get("data.variableName")), true);
         Map workflowDataMap = processInstanceEventContent.getMap("data.variableValue");
         assertThat(workflowDataMap).hasSize(1);
         assertThat(workflowDataMap).containsEntry("name", "javieritoPerson");

quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowTestUtils.java

@@ -47,12 +47,6 @@ public static JsonPath waitForKogitoProcessInstanceEvent(KafkaTestClient kafkaCl
 
     public static <T extends DataEvent<?>> JsonPath waitForKogitoProcessInstanceEvent(KafkaTestClient kafkaClient, Class<T> eventType, Predicate<JsonPath> predicate, boolean shutdownAfterConsume)
             throws Exception {
-        return waitForKogitoProcessInstanceEvent(kafkaClient, eventType, predicate, shutdownAfterConsume, () -> {
-        });
-    }
-
-    public static <T extends DataEvent<?>> JsonPath waitForKogitoProcessInstanceEvent(KafkaTestClient kafkaClient, Class<T> eventType, Predicate<JsonPath> predicate, boolean shutdownAfterConsume,
-            Runnable runnable) throws InterruptedException {
         final CountDownLatch countDownLatch = new CountDownLatch(1);
         final AtomicReference<JsonPath> cloudEvent = new AtomicReference<>();
 
@@ -67,13 +61,12 @@ public static <T extends DataEvent<?>> JsonPath waitForKogitoProcessInstanceEven
                 countDownLatch.countDown();
             }
         });
-
-        runnable.run();
         // give some time to consume the event
         assertThat(countDownLatch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)).isTrue();
         if (shutdownAfterConsume) {
             kafkaClient.shutdown();
         }
         return cloudEvent.get();
     }
+
 }