You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2023/08/21 07:21:34 UTC
[camel-quarkus] branch main updated: file: migrate pollEnrich to the non-flaky test harness #3584 (#5197)
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 29b54135c6 file: migrate pollEnrich to the non-flaky test harness #3584 (#5197)
29b54135c6 is described below
commit 29b54135c6c040f9227e1a0c43d0a41e99c7d89c
Author: Alexandre Gallice <al...@gmail.com>
AuthorDate: Mon Aug 21 09:21:27 2023 +0200
file: migrate pollEnrich to the non-flaky test harness #3584 (#5197)
---
.../camel/quarkus/component/file/it/FileRoutes.java | 2 +-
.../camel/quarkus/component/file/it/FileTest.java | 17 -----------------
.../quarkus/component/file/it/NonFlakyFileTest.java | 17 +++++++++++++++--
.../component/file/it/NonFlakyFileTestResource.java | 8 ++++++--
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java b/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java
index b7fbc796db..48f0de44b3 100644
--- a/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java
+++ b/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java
@@ -88,7 +88,7 @@ public class FileRoutes extends RouteBuilder {
.convertBodyTo(String.class).to("mock:" + SORT_BY);
from("direct:pollEnrich")
- .pollEnrich("file://target/pollEnrich?fileName=pollEnrich.txt");
+ .pollEnrich("file://target/test-files/poll-enrich?fileName=poll-enrich-file");
}
diff --git a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
index d72738f7c3..caeec3e14c 100644
--- a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
+++ b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
@@ -34,7 +34,6 @@ import io.restassured.http.ContentType;
import io.restassured.path.json.JsonPath;
import io.restassured.response.ValidatableResponse;
import org.apache.camel.quarkus.core.util.FileUtils;
-import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -271,20 +270,4 @@ class FileTest {
}
});
}
-
- @Test
- public void pollEnrich() throws IOException {
- final Path file = Paths.get("target/pollEnrich/pollEnrich.txt");
- Files.createDirectories(file.getParent());
- final String body = "Hi from pollEnrich.txt";
- Files.write(file, body.getBytes(StandardCharsets.UTF_8));
-
- RestAssured.given()
- .contentType(ContentType.TEXT)
- .post("/file/route/pollEnrich")
- .then()
- .statusCode(200)
- .body(Matchers.is(body));
- }
-
}
diff --git a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTest.java b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTest.java
index eccfb3aaa8..b42ca887d6 100644
--- a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTest.java
+++ b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTest.java
@@ -26,11 +26,14 @@ import java.util.concurrent.TimeUnit;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import static org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.FILTER_NON_SKIPPED_FILE_CONTENT;
import static org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.IDEMPOTENT_FILE_CONTENT;
import static org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.IDEMPOTENT_FILE_NAME;
+import static org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.POLL_ENRICH_FILE_CONTENT;
import static org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.TEST_FILES_FOLDER;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.core.IsEqual.equalTo;
@@ -48,7 +51,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
class NonFlakyFileTest {
@Test
- void idempotent() throws IOException, InterruptedException {
+ void idempotentFileShouldBeReadOnlyOnce() throws IOException, InterruptedException {
// Assert that the idempotent file has been read once
await().atMost(1, TimeUnit.SECONDS).until(
@@ -73,7 +76,7 @@ class NonFlakyFileTest {
}
@Test
- void filter() {
+ void filterShouldReadOnlyMatchingFile() {
await().atMost(1, TimeUnit.SECONDS).until(
() -> RestAssured
.get("/file/getFromMock/filter")
@@ -82,4 +85,14 @@ class NonFlakyFileTest {
equalTo(FILTER_NON_SKIPPED_FILE_CONTENT));
}
+ @Test
+ public void pollEnrichShouldSetExchangeBodyWithFileContent() {
+ RestAssured.given()
+ .contentType(ContentType.TEXT)
+ .post("/file/route/pollEnrich")
+ .then()
+ .statusCode(200)
+ .body(Matchers.is(POLL_ENRICH_FILE_CONTENT));
+ }
+
}
diff --git a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTestResource.java b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTestResource.java
index 3e70f22af6..fecf1404dd 100644
--- a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTestResource.java
+++ b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTestResource.java
@@ -34,10 +34,12 @@ public class NonFlakyFileTestResource implements QuarkusTestResourceLifecycleMan
static final Path TEST_FILES_FOLDER = Paths.get("target", "test-files");
- static final String IDEMPOTENT_FILE_NAME = "moved-back-read-once";
- static final String IDEMPOTENT_FILE_CONTENT = IDEMPOTENT_FILE_NAME + "-CONTENT";
static final String FILTER_NON_SKIPPED_FILE_NAME = "non-skipped-file";
static final String FILTER_NON_SKIPPED_FILE_CONTENT = FILTER_NON_SKIPPED_FILE_NAME + "-CONTENT";
+ static final String IDEMPOTENT_FILE_NAME = "moved-back-read-once";
+ static final String IDEMPOTENT_FILE_CONTENT = IDEMPOTENT_FILE_NAME + "-CONTENT";
+ static final String POLL_ENRICH_FILE_NAME = "poll-enrich-file";
+ static final String POLL_ENRICH_FILE_CONTENT = POLL_ENRICH_FILE_NAME + "-CONTENT";
private final List<Path> createdTestFiles = new ArrayList<Path>();
@@ -51,6 +53,8 @@ public class NonFlakyFileTestResource implements QuarkusTestResourceLifecycleMan
createTestFile("idempotent", IDEMPOTENT_FILE_NAME);
+ createTestFile("poll-enrich", POLL_ENRICH_FILE_NAME);
+
ensureAllTestFilesCreatedWithExpectedContent();
} catch (Exception ex) {
throw new RuntimeException("Problem while initializing test files", ex);