Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[KOGITO-7985] Job service integration tests improvements #1497

Merged
merged 14 commits into from
Nov 23, 2022
Merged

[KOGITO-7985] Job service integration tests improvements #1497

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a69358a
KOGITO-7985 Job service integration tests improvements
tiagodolphine Oct 27, 2022
c4f0162
fix imports
tiagodolphine Oct 28, 2022
55ac53a
improving quarkus test resources for job service
tiagodolphine Oct 28, 2022
3585294
working version in quarkus-messaging
tiagodolphine Nov 4, 2022
3ec30eb
working version in quarkus-messaging
tiagodolphine Nov 4, 2022
e330db4
Adjustments to centralize JosServiceCompose
tiagodolphine Nov 7, 2022
d901a80
removing uncessary code and addin ddl form data index
tiagodolphine Nov 7, 2022
812110b
adjusting spring boot IT to use in-memory jobservice container
tiagodolphine Nov 8, 2022
8059dd8
moving quarkus common module and adding more data index tests
tiagodolphine Nov 8, 2022
c024e3f
adding more IT with data index, fix repetitive timers
tiagodolphine Nov 9, 2022
7af2987
applying pr comments
tiagodolphine Nov 16, 2022
5ed5810
Moving BaseCallbackStateTimeoutsIT to test folder
tiagodolphine Nov 17, 2022
83811dd
remove abstract test classes from mvn IT execution
tiagodolphine Nov 18, 2022
32af5d4
adding comment to describe why the filesystem persistence is enabled …
tiagodolphine Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions ...us/src/main/java/org/kie/kogito/test/resources/AbstractJobServiceQuarkusTestResource.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...arkus/src/main/java/org/kie/kogito/test/resources/JobServiceKafkaQuarkusTestResource.java
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions ...on-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceQuarkusTestResource.java
View file
Open in desktop

This file was deleted.

22 changes: 18 additions & 4 deletions ...on-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessTimerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.kie.kogito.test.TestUtils.assertJobsAndProcessOnDataIndex;

public abstract class BaseProcessTimerIT implements JobServiceHealthAware {

Expand All @@ -42,11 +43,16 @@ public abstract class BaseProcessTimerIT implements JobServiceHealthAware {
//Timers Tests
@Test
public void testTimers() {
String id = createTimer(new RequestPayload("PT02S"), TIMERS);
String id = createTimer(new RequestPayload("PT01S"), TIMERS);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

silly comment, but I believe "01" shouldn't be needed here, "PT1S" sounds more natural in my opinion.

Object id2 = getTimerById(id, TIMERS);
assertThat(id).isEqualTo(id2);
await().atMost(TIMEOUT)
.untilAsserted(() -> getTimerWithStatusCode(id, 404, TIMERS));
assertJobsAndProcessOnDataIndex(dataIndexUrl(), TIMERS, id, "COMPLETED", "EXECUTED", TIMEOUT);
}

public String dataIndexUrl() {
return null;
}

@Test
Expand All @@ -55,6 +61,7 @@ public void testCancelTimer() {
Object id2 = deleteTimer(id, TIMERS);
assertThat(id).isEqualTo(id2);
getTimerWithStatusCode(id, 404, TIMERS);
assertJobsAndProcessOnDataIndex(dataIndexUrl(), TIMERS, id, "ABORTED", "CANCELED", TIMEOUT);
}

//Cycle Timers Tests
Expand All @@ -64,25 +71,31 @@ public void testTimerCycle() {
String id2 = getTimerById(id, TIMERS_CYCLE);
assertThat(id).isEqualTo(id2);
await().atMost(TIMEOUT)
.untilAsserted(() -> getTimerWithStatusCode(id, 404, TIMERS));
.untilAsserted(() -> getTimerWithStatusCode(id, 404, TIMERS_CYCLE));
assertJobsAndProcessOnDataIndex(dataIndexUrl(), TIMERS_CYCLE, id, "COMPLETED", "EXECUTED", TIMEOUT);
}

@Test
public void testDeleteTimerCycle() {
String id = createTimer(new RequestPayload("R20/PT1S"), TIMERS_CYCLE);
String id = createTimer(new RequestPayload("R20/PT10S"), TIMERS_CYCLE);
String id2 = getTimerById(id, TIMERS_CYCLE);
assertThat(id).isEqualTo(id2);
deleteTimer(id, TIMERS_CYCLE);
await().atMost(TIMEOUT)
.untilAsserted(() -> getTimerWithStatusCode(id, 404, TIMERS_CYCLE));
await().atMost(TIMEOUT)
.untilAsserted(() -> assertJobsAndProcessOnDataIndex(dataIndexUrl(), TIMERS_CYCLE, id, "ABORTED", "CANCELED", TIMEOUT));
}

//Boundary Timers Tests
@Test
public void testBoundaryTimersOnTask() {
String id = createTimer(new RequestPayload("PT02S"), TIMERS_ON_TASK);
String id = createTimer(new RequestPayload("PT01S"), TIMERS_ON_TASK);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here "01"

String id2 = getTimerById(id, TIMERS_ON_TASK);
assertThat(id).isEqualTo(id2);
await().atMost(TIMEOUT)
.untilAsserted(() -> getTimerWithStatusCode(id, 404, TIMERS_ON_TASK));
assertJobsAndProcessOnDataIndex(dataIndexUrl(), TIMERS_ON_TASK, id, "COMPLETED", "EXECUTED", TIMEOUT);
}

@Test
Expand All @@ -91,6 +104,7 @@ public void testDeleteBoundaryTimersOnTask() {
String id2 = getTimerById(id, TIMERS_ON_TASK);
assertThat(id).isEqualTo(id2);
deleteTimer(id, TIMERS_ON_TASK);
assertJobsAndProcessOnDataIndex(dataIndexUrl(), TIMERS_ON_TASK, id, "ABORTED", "CANCELED", TIMEOUT);
}

private ValidatableResponse getTimerWithStatusCode(String id, int code, String path) {
Expand Down
46 changes: 46 additions & 0 deletions ...ce/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@

package org.kie.kogito.test;

import java.time.Duration;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

import org.awaitility.Awaitility;
import org.kie.kogito.test.quarkus.kafka.KafkaTestClient;

import io.restassured.http.ContentType;
Expand All @@ -28,6 +30,7 @@
import static io.restassured.RestAssured.given;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;

public class TestUtils {
Expand Down Expand Up @@ -123,4 +126,47 @@ public static JsonPath waitForEvent(KafkaTestClient kafkaClient, String topic, l
assertThat(countDownLatch.await(seconds, TimeUnit.SECONDS)).isTrue();
return new JsonPath(cloudEvent.get());
}

public static void assertJobsAndProcessOnDataIndex(String dataIndexURL, String processId, String processInstanceId, String processStatus, String jobStatus, Duration timeout) {
if (dataIndexURL != null) {
String query = "{ \"query\" : " +
"\"{ProcessInstances (where : {" +
" id: {equal : \\\"" + processInstanceId + "\\\" }" +
" }) {" +
" id,processId,state" +
" }" +
"}\"" +
"}";
Awaitility.await()
.atMost(timeout)
.untilAsserted(() -> given()
.baseUri(dataIndexURL)
.contentType(ContentType.JSON)
.body(query)
.when().post("/graphql")
.then().statusCode(200)
.body("data.ProcessInstances.size()", is(1))
.body("data.ProcessInstances[0].id", is(processInstanceId))
.body("data.ProcessInstances[0].processId", is(processId))
.body("data.ProcessInstances[0].state", is(processStatus)));

String queryJobs = "{ \"query\" : " +
"\"{Jobs (where : {" +
" processInstanceId: {equal : \\\"" + processInstanceId + "\\\" }" +
" }) {" +
" status" +
" }" +
"}\"" +
"}";

given()
.baseUri(dataIndexURL)
.contentType(ContentType.JSON)
.body(queryJobs)
.when().post("/graphql")
.then().statusCode(200)
.body("data.Jobs.size()", is(1))
.body("data.Jobs[0].status", is(jobStatus));
}
}
}
42 changes: 0 additions & 42 deletions ...ervice-common/src/main/java/org/kie/kogito/test/resources/AbstractJobServiceResource.java
View file
Open in desktop

This file was deleted.

Loading