This is an automated email from the ASF dual-hosted git repository.
jamesnetherton 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 e490008680 Restore file tests original class naming
e490008680 is described below
commit e4900086808516c04ef05f36a9b6c771b12db170
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Apr 9 07:38:55 2024 +0100
Restore file tests original class naming
---
.../file/it/{NonFlakyFileIT.java => FileIT.java} | 2 +-
.../it/{NonFlakyFileTest.java => FileTest.java} | 48 +++++++++++-----------
...FileTestResource.java => FileTestResource.java} | 2 +-
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileIT.java
b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileIT.java
similarity index 95%
rename from
integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileIT.java
rename to
integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileIT.java
index cfb323f4d8..62dda77376 100644
---
a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileIT.java
+++
b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileIT.java
@@ -19,6 +19,6 @@ package org.apache.camel.quarkus.component.file.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
@QuarkusIntegrationTest
-class NonFlakyFileIT extends NonFlakyFileTest {
+class FileIT extends FileTest {
}
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/FileTest.java
similarity index 82%
rename from
integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTest.java
rename to
integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
index 77a1afd429..297d87694c 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/FileTest.java
@@ -37,27 +37,27 @@ import org.junit.jupiter.api.Test;
import static
org.apache.camel.quarkus.component.file.it.FileResource.SEPARATOR;
import static org.apache.camel.quarkus.component.file.it.FileResource.SORT_BY;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.BATCH_FILE_NAME_1_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.BATCH_FILE_NAME_2_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.CHARSET_READ_FILE_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.CHARSET_WRITE_FILE_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.CHARSET_WRITE_FILE_CREATION_FOLDER;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.CHARSET_WRITE_FILE_NAME;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.FILE_CREATION_FILE_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.FILE_CREATION_FILE_NAME;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.FILE_CREATION_FOLDER;
-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.QUARTZ_SCHEDULED_FILE_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.READ_LOCK_FILE_NAME;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.READ_LOCK_FOLDER_IN;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.READ_LOCK_FOLDER_OUT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.SORT_BY_NAME_1_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.SORT_BY_NAME_2_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.SORT_BY_NAME_3_CONTENT;
-import static
org.apache.camel.quarkus.component.file.it.NonFlakyFileTestResource.TEST_FILES_FOLDER;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.BATCH_FILE_NAME_1_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.BATCH_FILE_NAME_2_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.CHARSET_READ_FILE_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.CHARSET_WRITE_FILE_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.CHARSET_WRITE_FILE_CREATION_FOLDER;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.CHARSET_WRITE_FILE_NAME;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.FILE_CREATION_FILE_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.FILE_CREATION_FILE_NAME;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.FILE_CREATION_FOLDER;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.FILTER_NON_SKIPPED_FILE_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.IDEMPOTENT_FILE_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.IDEMPOTENT_FILE_NAME;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.POLL_ENRICH_FILE_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.QUARTZ_SCHEDULED_FILE_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.READ_LOCK_FILE_NAME;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.READ_LOCK_FOLDER_IN;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.READ_LOCK_FOLDER_OUT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.SORT_BY_NAME_1_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.SORT_BY_NAME_2_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.SORT_BY_NAME_3_CONTENT;
+import static
org.apache.camel.quarkus.component.file.it.FileTestResource.TEST_FILES_FOLDER;
import static org.apache.commons.io.FileUtils.readFileToString;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.core.IsEqual.equalTo;
@@ -74,8 +74,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Linked to https://github.com/apache/camel-quarkus/issues/3584
*/
@QuarkusTest
-@QuarkusTestResource(NonFlakyFileTestResource.class)
-class NonFlakyFileTest {
+@QuarkusTestResource(FileTestResource.class)
+class FileTest {
@Test
void idempotentFileShouldBeReadOnlyOnce() throws IOException,
InterruptedException {
@@ -234,7 +234,7 @@ class NonFlakyFileTest {
@Test
public void fileWatchShouldCatchCreateModifyAndDeleteEvents() throws
IOException {
- final Path fileWatchDirectory =
Files.createTempDirectory(NonFlakyFileTest.class.getSimpleName()).toRealPath();
+ final Path fileWatchDirectory =
Files.createTempDirectory(FileTest.class.getSimpleName()).toRealPath();
RestAssured.given()
.queryParam("path", fileWatchDirectory.toString())
.get("/file-watch/get-events")
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/FileTestResource.java
similarity index 98%
rename from
integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileTestResource.java
rename to
integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTestResource.java
index ea11deafc4..08f74c35be 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/FileTestResource.java
@@ -32,7 +32,7 @@ import org.apache.commons.io.FileUtils;
/**
* Ensures that all test files are created with expected content before camel
routes starts to consume them.
*/
-public class NonFlakyFileTestResource implements
QuarkusTestResourceLifecycleManager {
+public class FileTestResource implements QuarkusTestResourceLifecycleManager {
static final Path TEST_FILES_FOLDER = Paths.get("target", "test-files");
