From f1b05eddcdbbbb485f40c47549f2ae98794fc418 Mon Sep 17 00:00:00 2001 From: Lukas Lowinger Date: Mon, 14 Oct 2024 14:53:39 +0200 Subject: [PATCH] Fix Azure tests --- .../azure/azure-eventhubs/pom.xml | 5 ++ .../eventhubs/it/AzureEventhubsTest.java | 55 ++++++++++++------- integration-tests/azure-grouped/pom.xml | 5 ++ 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/integration-test-groups/azure/azure-eventhubs/pom.xml b/integration-test-groups/azure/azure-eventhubs/pom.xml index 0d87f70a3510..e16a4709c356 100644 --- a/integration-test-groups/azure/azure-eventhubs/pom.xml +++ b/integration-test-groups/azure/azure-eventhubs/pom.xml @@ -72,6 +72,11 @@ awaitility test + + org.assertj + assertj-core + test + org.apache.camel.quarkus camel-quarkus-integration-tests-support-azure diff --git a/integration-test-groups/azure/azure-eventhubs/src/test/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsTest.java b/integration-test-groups/azure/azure-eventhubs/src/test/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsTest.java index 88449d6187e4..8d774afa8334 100644 --- a/integration-test-groups/azure/azure-eventhubs/src/test/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsTest.java +++ b/integration-test-groups/azure/azure-eventhubs/src/test/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsTest.java @@ -26,11 +26,13 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.response.Response; +import io.restassured.response.ValidatableResponse; import org.awaitility.Awaitility; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; @@ -63,7 +65,7 @@ void produceConsumeEvents() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .queryParam("endpointUri", "mock:partition-0-results") .body(messageBody) .get("/azure-eventhubs/receive-event") @@ -72,9 +74,10 @@ void produceConsumeEvents() { .body( "body", is(messageBody), "headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "headers.CamelAzureEventHubsPartitionId", is("0"), "headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + assertThat(((Number) (response.extract().path("headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); } finally { RestAssured.given() @@ -105,7 +108,7 @@ void produceMultipleMessages() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .contentType(ContentType.JSON) .queryParam("endpointUri", "mock:partition-1-results") .body(messages) @@ -116,19 +119,23 @@ void produceMultipleMessages() { "size()", is(3), "[0].body", is(messages.get(0)), "[0].headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "[0].headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "[0].headers.CamelAzureEventHubsPartitionId", is("1"), "[0].headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0), "[1].body", is(messages.get(1)), "[1].headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "[1].headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "[1].headers.CamelAzureEventHubsPartitionId", is("1"), "[1].headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0), "[2].body", is(messages.get(2)), "[2].headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "[2].headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "[2].headers.CamelAzureEventHubsPartitionId", is("1"), "[2].headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + + assertThat(((Number) (response.extract().path("[0].headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); + assertThat(((Number) (response.extract().path("[1].headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); + assertThat(((Number) (response.extract().path("[2].headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); } finally { RestAssured.given() @@ -157,7 +164,7 @@ void produceConsumeEventsWithCustomClient() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .queryParam("endpointUri", "mock:partition-0-custom-client-results") .body(messageBody) .get("/azure-eventhubs/receive-event") @@ -166,9 +173,10 @@ void produceConsumeEventsWithCustomClient() { .body( "body", is(messageBody), "headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "headers.CamelAzureEventHubsPartitionId", is("0"), "headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + assertThat(((Number) (response.extract().path("headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); } finally { RestAssured.given() @@ -200,7 +208,7 @@ void customEventPosition() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .queryParam("endpointUri", "mock:partition-2-initial-results") .contentType(ContentType.JSON) .body(messages) @@ -211,19 +219,22 @@ void customEventPosition() { "size()", is(3), "[0].body", is(messages.get(0)), "[0].headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "[0].headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "[0].headers.CamelAzureEventHubsPartitionId", is("2"), "[0].headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0), "[1].body", is(messages.get(1)), "[1].headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "[1].headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "[1].headers.CamelAzureEventHubsPartitionId", is("2"), "[1].headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0), "[2].body", is(messages.get(2)), "[2].headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "[2].headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "[2].headers.CamelAzureEventHubsPartitionId", is("2"), "[2].headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + assertThat(((Number) (response.extract().path("[0].headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); + assertThat(((Number) (response.extract().path("[1].headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); + assertThat(((Number) (response.extract().path("[2].headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); RestAssured.given() @@ -284,7 +295,7 @@ void tokenCredentials() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .queryParam("endpointUri", "mock:partition-3-results") .body(messageBody) .get("/azure-eventhubs/receive-event") @@ -293,9 +304,10 @@ void tokenCredentials() { .body( "body", is(messageBody), "headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "headers.CamelAzureEventHubsPartitionId", is("3"), "headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + assertThat(((Number) (response.extract().path("headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); } finally { RestAssured.given() @@ -326,7 +338,7 @@ void azureIdentityCredentials() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .queryParam("endpointUri", "mock:partition-4-results") .body(messageBody) .get("/azure-eventhubs/receive-event") @@ -335,9 +347,10 @@ void azureIdentityCredentials() { .body( "body", is(messageBody), "headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "headers.CamelAzureEventHubsPartitionId", is("4"), "headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + assertThat(((Number) (response.extract().path("headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); } finally { RestAssured.given() @@ -366,7 +379,7 @@ void amqpWebSocketsTransport() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .queryParam("endpointUri", "mock:partition-4-ws-transport-results") .body(messageBody) .get("/azure-eventhubs/receive-event") @@ -375,9 +388,10 @@ void amqpWebSocketsTransport() { .body( "body", is(messageBody), "headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "headers.CamelAzureEventHubsPartitionId", is("4"), "headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + assertThat(((Number) (response.extract().path("headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); } finally { RestAssured.given() @@ -406,7 +420,7 @@ void generatedConnectionString() { .statusCode(201); Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(1, TimeUnit.MINUTES).untilAsserted(() -> { - RestAssured.given() + ValidatableResponse response = RestAssured.given() .queryParam("endpointUri", "mock:partition-0-generated-connection-string-results") .body(messageBody) .get("/azure-eventhubs/receive-event") @@ -415,9 +429,10 @@ void generatedConnectionString() { .body( "body", is(messageBody), "headers.CamelAzureEventHubsEnqueuedTime", notNullValue(), - "headers.CamelAzureEventHubsOffset", greaterThanOrEqualTo(0), "headers.CamelAzureEventHubsPartitionId", is("0"), "headers.CamelAzureEventHubsSequenceNumber", greaterThanOrEqualTo(0)); + assertThat(((Number) (response.extract().path("headers.CamelAzureEventHubsOffset"))).longValue()) + .isGreaterThanOrEqualTo(0); }); } finally { RestAssured.given() diff --git a/integration-tests/azure-grouped/pom.xml b/integration-tests/azure-grouped/pom.xml index ffa6913a85d4..84c29be2bde0 100644 --- a/integration-tests/azure-grouped/pom.xml +++ b/integration-tests/azure-grouped/pom.xml @@ -95,6 +95,11 @@ camel-quarkus-integration-tests-support-azure test + + org.assertj + assertj-core + test + org.awaitility awaitility