From 86afa74747d4938c6ad3f14fc225ab981e2fcc6e Mon Sep 17 00:00:00 2001 From: l3002 Date: Thu, 7 Mar 2024 19:08:03 +0530 Subject: [PATCH 1/4] chore(test): added separatorsToSystem() to resourceDir assertion statement Signed-off-by: l3002 --- .../eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java index e1c9fbbf16..eb20998fa7 100644 --- a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java +++ b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java @@ -22,6 +22,7 @@ import java.io.File; +import static org.apache.commons.io.FilenameUtils.separatorsToSystem; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; @@ -52,7 +53,7 @@ void buildServiceConfigBuilder_shouldReturnNonNullResourceConfigIfConfigured() { BuildServiceConfig.BuildServiceConfigBuilder buildServiceConfigBuilder = buildMojo.buildServiceConfigBuilder(); // Then assertThat(buildServiceConfigBuilder.build()).isNotNull() - .returns("src/main/jkube", c -> c.getResourceDir().getPath()) + .returns(separatorsToSystem("src/main/jkube"), c -> c.getResourceDir().getPath()) .extracting(BuildServiceConfig::getResourceConfig) .extracting(ResourceConfig::getOpenshiftBuildConfig) .returns("200m", c -> c.getLimits().get("cpu")) From 8cd79266a4c3ac02cca97b46e6d7f30a79324298 Mon Sep 17 00:00:00 2001 From: l3002 Date: Thu, 7 Mar 2024 19:09:17 +0530 Subject: [PATCH 2/4] chore(test): replaced LF with platform specific line separator Signed-off-by: l3002 --- .../jkube/maven/plugin/mojo/build/HelmLintMojoTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java index b0ef06a230..6a084dcc76 100644 --- a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java +++ b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java @@ -68,7 +68,7 @@ void execute_withMissingHelmPackage_shouldThrowException() { .isInstanceOf(JKubeException.class) .hasMessage("Linting failed"); assertThat(outputStream.toString()) - .contains("Linting empty-project 0.1.0\n") + .contains(String.format("Linting empty-project 0.1.0%n")) .contains("Using packaged file:") .contains("[[W]]Error unable to open tarball:"); } @@ -79,7 +79,7 @@ void execute_withHelmPackage_shouldSucceed() throws Exception { .packageIt().withDestination(projectDir.resolve("target").resolve("jkube").resolve("helm").resolve("empty-project").resolve("kubernetes")).call(); helmLintMojo.execute(); assertThat(outputStream.toString()) - .contains("Linting empty-project 0.1.0\n") + .contains(String.format("Linting empty-project 0.1.0%n")) .contains("Using packaged file:") .contains("[[W]][INFO] Chart.yaml: icon is recommended") .contains("Linting successful"); From de87978f4b1afe8f6bea408c094edfe1e08f7b9b Mon Sep 17 00:00:00 2001 From: l3002 Date: Fri, 8 Mar 2024 23:00:24 +0530 Subject: [PATCH 3/4] chore(test): used File to assert return value of getResourceDir() --- .../eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java index eb20998fa7..4be5d04538 100644 --- a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java +++ b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java @@ -53,7 +53,7 @@ void buildServiceConfigBuilder_shouldReturnNonNullResourceConfigIfConfigured() { BuildServiceConfig.BuildServiceConfigBuilder buildServiceConfigBuilder = buildMojo.buildServiceConfigBuilder(); // Then assertThat(buildServiceConfigBuilder.build()).isNotNull() - .returns(separatorsToSystem("src/main/jkube"), c -> c.getResourceDir().getPath()) + .returns(new File("src/main/jkube"), c -> c.getResourceDir()) .extracting(BuildServiceConfig::getResourceConfig) .extracting(ResourceConfig::getOpenshiftBuildConfig) .returns("200m", c -> c.getLimits().get("cpu")) From 46feac2c47a582cc331320110e5f4336875aeda4 Mon Sep 17 00:00:00 2001 From: l3002 Date: Mon, 11 Mar 2024 21:52:30 +0530 Subject: [PATCH 4/4] chore(test): added method reference for resourceDir assertion --- .../eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java index 4be5d04538..d3cc306baa 100644 --- a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java +++ b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java @@ -22,7 +22,6 @@ import java.io.File; -import static org.apache.commons.io.FilenameUtils.separatorsToSystem; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; @@ -53,7 +52,7 @@ void buildServiceConfigBuilder_shouldReturnNonNullResourceConfigIfConfigured() { BuildServiceConfig.BuildServiceConfigBuilder buildServiceConfigBuilder = buildMojo.buildServiceConfigBuilder(); // Then assertThat(buildServiceConfigBuilder.build()).isNotNull() - .returns(new File("src/main/jkube"), c -> c.getResourceDir()) + .returns(new File("src/main/jkube"), BuildServiceConfig::getResourceDir) .extracting(BuildServiceConfig::getResourceConfig) .extracting(ResourceConfig::getOpenshiftBuildConfig) .returns("200m", c -> c.getLimits().get("cpu"))