From 5cc33c90f36c7cee7b7d686e35e45f41d6c42aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Mon, 15 Jan 2024 11:07:11 +0100 Subject: [PATCH] fix(core): rename test application.yml to application-test.yml (#2225) --- .gitignore | 1 - .../{application.yml => application-test.yml} | 0 .../repositories/AbstractExecutionServiceTest.java | 2 +- .../test/java/io/kestra/core/runners/InputsTest.java | 6 +++--- .../java/io/kestra/core/tasks/storages/ConcatTest.java | 4 ++-- .../java/io/kestra/core/tasks/storages/DeleteTest.java | 2 +- .../io/kestra/core/tasks/storages/LocalFilesTest.java | 10 +++++----- .../java/io/kestra/core/tasks/storages/SizeTest.java | 2 +- .../{application.yml => application-test.yml} | 0 .../{application.yml => application-test.yml} | 0 .../{application.yml => application-test.yml} | 0 .../{application.yml => application-test.yml} | 0 .../{application.yml => application-test.yml} | 0 .../{application.yml => application-test.yml} | 0 .../{application.yml => application-test.yml} | 0 .../webserver/controllers/ExecutionControllerTest.java | 4 ++-- .../{application.yml => application-test.yml} | 0 17 files changed, 15 insertions(+), 16 deletions(-) rename cli/src/test/resources/{application.yml => application-test.yml} (100%) rename core/src/test/resources/{application.yml => application-test.yml} (100%) rename jdbc-h2/src/test/resources/{application.yml => application-test.yml} (100%) rename jdbc-mysql/src/test/resources/{application.yml => application-test.yml} (100%) rename jdbc-postgres/src/test/resources/{application.yml => application-test.yml} (100%) rename repository-memory/src/test/resources/{application.yml => application-test.yml} (100%) rename runner-memory/src/test/resources/{application.yml => application-test.yml} (100%) rename storage-local/src/test/resources/{application.yml => application-test.yml} (100%) rename webserver/src/test/resources/{application.yml => application-test.yml} (100%) diff --git a/.gitignore b/.gitignore index 053ae63c56..30086d26e0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ out/ ### Configurations docker-compose.override.yml cli/src/main/resources/application-*.yml -*/src/test/resources/application-test.yml /local ### Javascript diff --git a/cli/src/test/resources/application.yml b/cli/src/test/resources/application-test.yml similarity index 100% rename from cli/src/test/resources/application.yml rename to cli/src/test/resources/application-test.yml diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java index d676325d3b..de83d1ac45 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java @@ -48,7 +48,7 @@ public abstract class AbstractExecutionServiceTest { @Test void purge() throws Exception { - URL resource = AbstractExecutionServiceTest.class.getClassLoader().getResource("application.yml"); + URL resource = AbstractExecutionServiceTest.class.getClassLoader().getResource("application-test.yml"); File tempFile = File.createTempFile("test", ""); Files.copy(new FileInputStream(Objects.requireNonNull(resource).getFile()), tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING); diff --git a/core/src/test/java/io/kestra/core/runners/InputsTest.java b/core/src/test/java/io/kestra/core/runners/InputsTest.java index 543dda1d8b..e843732919 100644 --- a/core/src/test/java/io/kestra/core/runners/InputsTest.java +++ b/core/src/test/java/io/kestra/core/runners/InputsTest.java @@ -41,7 +41,7 @@ public class InputsTest extends AbstractMemoryRunnerTest { .put("date", "2019-10-06") .put("time", "18:27:49") .put("duration", "PT5M6S") - .put("file", Objects.requireNonNull(InputsTest.class.getClassLoader().getResource("application.yml")).getPath()) + .put("file", Objects.requireNonNull(InputsTest.class.getClassLoader().getResource("application-test.yml")).getPath()) .put("json", "{\"a\": \"b\"}") .put("uri", "https://www.google.com") .put("nested.string", "a string") @@ -108,7 +108,7 @@ public class InputsTest extends AbstractMemoryRunnerTest { assertThat(typeds.get("date"), is(LocalDate.parse("2019-10-06"))); assertThat(typeds.get("time"), is(LocalTime.parse("18:27:49"))); assertThat(typeds.get("duration"), is(Duration.parse("PT5M6S"))); - assertThat((URI) typeds.get("file"), is(new URI("kestra:///io/kestra/tests/inputs/executions/test/inputs/file/application.yml"))); + assertThat((URI) typeds.get("file"), is(new URI("kestra:///io/kestra/tests/inputs/executions/test/inputs/file/application-test.yml"))); assertThat( CharStreams.toString(new InputStreamReader(storageInterface.get(null, (URI) typeds.get("file")))), is(CharStreams.toString(new InputStreamReader(new FileInputStream((String) inputs.get("file"))))) @@ -154,7 +154,7 @@ public class InputsTest extends AbstractMemoryRunnerTest { assertThat(execution.getState().getCurrent(), is(State.Type.SUCCESS)); assertThat( (String) execution.findTaskRunsByTaskId("file").get(0).getOutputs().get("value"), - matchesRegex("kestra:///io/kestra/tests/inputs/executions/.*/inputs/file/application.yml") + matchesRegex("kestra:///io/kestra/tests/inputs/executions/.*/inputs/file/application-test.yml") ); } diff --git a/core/src/test/java/io/kestra/core/tasks/storages/ConcatTest.java b/core/src/test/java/io/kestra/core/tasks/storages/ConcatTest.java index 9a0fa7d9d8..873c77c93f 100644 --- a/core/src/test/java/io/kestra/core/tasks/storages/ConcatTest.java +++ b/core/src/test/java/io/kestra/core/tasks/storages/ConcatTest.java @@ -32,10 +32,10 @@ class ConcatTest { void run(Boolean json) throws Exception { RunContext runContext = runContextFactory.of(); - URL resource = ConcatTest.class.getClassLoader().getResource("application.yml"); + URL resource = ConcatTest.class.getClassLoader().getResource("application-test.yml"); File file = new File(Objects.requireNonNull(ConcatTest.class.getClassLoader() - .getResource("application.yml")) + .getResource("application-test.yml")) .toURI()); URI put = storageInterface.put( diff --git a/core/src/test/java/io/kestra/core/tasks/storages/DeleteTest.java b/core/src/test/java/io/kestra/core/tasks/storages/DeleteTest.java index 5ff8da14b4..090a47de4f 100644 --- a/core/src/test/java/io/kestra/core/tasks/storages/DeleteTest.java +++ b/core/src/test/java/io/kestra/core/tasks/storages/DeleteTest.java @@ -28,7 +28,7 @@ class DeleteTest { @Test void run() throws Exception { RunContext runContext = runContextFactory.of(); - URL resource = DeleteTest.class.getClassLoader().getResource("application.yml"); + URL resource = DeleteTest.class.getClassLoader().getResource("application-test.yml"); URI put = storageInterface.put( null, diff --git a/core/src/test/java/io/kestra/core/tasks/storages/LocalFilesTest.java b/core/src/test/java/io/kestra/core/tasks/storages/LocalFilesTest.java index 77001b4ea8..b895fd47e6 100644 --- a/core/src/test/java/io/kestra/core/tasks/storages/LocalFilesTest.java +++ b/core/src/test/java/io/kestra/core/tasks/storages/LocalFilesTest.java @@ -32,7 +32,7 @@ class LocalFilesTest { StorageInterface storageInterface; private URI internalFiles() throws IOException, URISyntaxException { - var resource = ConcatTest.class.getClassLoader().getResource("application.yml"); + var resource = ConcatTest.class.getClassLoader().getResource("application-test.yml"); return storageInterface.put( null, @@ -53,7 +53,7 @@ class LocalFilesTest { .inputs(Map.of( "hello-input.txt", "Hello Input", "execution.txt", "{{toto}}", - "application.yml", storageFile.toString() + "application-test.yml", storageFile.toString() )) .outputs(List.of("hello-input.txt")) .build(); @@ -69,7 +69,7 @@ class LocalFilesTest { assertThat(runContext.tempDir().toFile().list().length, is(2)); assertThat(Files.readString(runContext.tempDir().resolve("execution.txt")), is("tata")); assertThat( - Files.readString(runContext.tempDir().resolve("application.yml")), + Files.readString(runContext.tempDir().resolve("application-test.yml")), is(new String(storageInterface.get(null, storageFile).readAllBytes())) ); @@ -87,7 +87,7 @@ class LocalFilesTest { .inputs(Map.of( "test/hello-input.txt", "Hello Input", "test/sub/dir/2/execution.txt", "{{toto}}", - "test/sub/dir/3/application.yml", storageFile.toString() + "test/sub/dir/3/application-test.yml", storageFile.toString() )) .outputs(List.of("test/**")) .build(); @@ -106,7 +106,7 @@ class LocalFilesTest { is("tata") ); assertThat( - new String(storageInterface.get(null, outputs.getUris().get("test/sub/dir/3/application.yml")) + new String(storageInterface.get(null, outputs.getUris().get( "test/sub/dir/3/application-test.yml")) .readAllBytes()), is(new String(storageInterface.get(null, storageFile).readAllBytes())) ); diff --git a/core/src/test/java/io/kestra/core/tasks/storages/SizeTest.java b/core/src/test/java/io/kestra/core/tasks/storages/SizeTest.java index 9e5528d8f0..fc459ce11c 100644 --- a/core/src/test/java/io/kestra/core/tasks/storages/SizeTest.java +++ b/core/src/test/java/io/kestra/core/tasks/storages/SizeTest.java @@ -26,7 +26,7 @@ class SizeTest { @Test void run() throws Exception { RunContext runContext = runContextFactory.of(); - URL resource = SizeTest.class.getClassLoader().getResource("application.yml"); + URL resource = SizeTest.class.getClassLoader().getResource("application-test.yml"); URI put = storageInterface.put( null, diff --git a/core/src/test/resources/application.yml b/core/src/test/resources/application-test.yml similarity index 100% rename from core/src/test/resources/application.yml rename to core/src/test/resources/application-test.yml diff --git a/jdbc-h2/src/test/resources/application.yml b/jdbc-h2/src/test/resources/application-test.yml similarity index 100% rename from jdbc-h2/src/test/resources/application.yml rename to jdbc-h2/src/test/resources/application-test.yml diff --git a/jdbc-mysql/src/test/resources/application.yml b/jdbc-mysql/src/test/resources/application-test.yml similarity index 100% rename from jdbc-mysql/src/test/resources/application.yml rename to jdbc-mysql/src/test/resources/application-test.yml diff --git a/jdbc-postgres/src/test/resources/application.yml b/jdbc-postgres/src/test/resources/application-test.yml similarity index 100% rename from jdbc-postgres/src/test/resources/application.yml rename to jdbc-postgres/src/test/resources/application-test.yml diff --git a/repository-memory/src/test/resources/application.yml b/repository-memory/src/test/resources/application-test.yml similarity index 100% rename from repository-memory/src/test/resources/application.yml rename to repository-memory/src/test/resources/application-test.yml diff --git a/runner-memory/src/test/resources/application.yml b/runner-memory/src/test/resources/application-test.yml similarity index 100% rename from runner-memory/src/test/resources/application.yml rename to runner-memory/src/test/resources/application-test.yml diff --git a/storage-local/src/test/resources/application.yml b/storage-local/src/test/resources/application-test.yml similarity index 100% rename from storage-local/src/test/resources/application.yml rename to storage-local/src/test/resources/application-test.yml diff --git a/webserver/src/test/java/io/kestra/webserver/controllers/ExecutionControllerTest.java b/webserver/src/test/java/io/kestra/webserver/controllers/ExecutionControllerTest.java index d4b686a58a..f2f32b117e 100644 --- a/webserver/src/test/java/io/kestra/webserver/controllers/ExecutionControllerTest.java +++ b/webserver/src/test/java/io/kestra/webserver/controllers/ExecutionControllerTest.java @@ -84,7 +84,7 @@ class ExecutionControllerTest extends JdbcH2ControllerTest { .put("int", "42") .put("float", "42.42") .put("instant", "2019-10-06T18:27:49Z") - .put("file", Objects.requireNonNull(InputsTest.class.getClassLoader().getResource("application.yml")).getPath()) + .put("file", Objects.requireNonNull(InputsTest.class.getClassLoader().getResource("application-test.yml")).getPath()) .build(); @Test @@ -108,7 +108,7 @@ class ExecutionControllerTest extends JdbcH2ControllerTest { private MultipartBody createInputsFlowBody() { // Trigger execution File applicationFile = new File(Objects.requireNonNull( - ExecutionControllerTest.class.getClassLoader().getResource("application.yml") + ExecutionControllerTest.class.getClassLoader().getResource("application-test.yml") ).getPath()); File logbackFile = new File(Objects.requireNonNull( diff --git a/webserver/src/test/resources/application.yml b/webserver/src/test/resources/application-test.yml similarity index 100% rename from webserver/src/test/resources/application.yml rename to webserver/src/test/resources/application-test.yml