From b7e1d6cccaa0c29074ac10bf29437fc1416ba68e Mon Sep 17 00:00:00 2001 From: Tanmay Mathpal Date: Tue, 30 Jan 2024 16:04:32 +0530 Subject: [PATCH] fix : fixed broken unit tests for `jkube-kit/common` on windows (#2574) * fix : fixed broken unit tests for windows --- .../jkube/kit/common/ExternalCommandTest.java | 5 +++ .../archive/ArchiveDecompressorTest.java | 3 +- .../jkube/kit/common/util/IoUtilTest.java | 3 +- .../kit/common/util/SerializationTest.java | 40 +++++++++---------- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/ExternalCommandTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/ExternalCommandTest.java index 002e14d2ed..d8eddae98e 100644 --- a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/ExternalCommandTest.java +++ b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/ExternalCommandTest.java @@ -15,6 +15,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.io.TempDir; import java.io.File; @@ -33,6 +35,7 @@ void setUp() { } @Test + @DisabledOnOs(OS.WINDOWS) void execute_whenCommandCompletedSuccessfully_thenPrintResult() throws IOException { // Given TestCommand testCommand = new TestCommand(kitLogger, new String[] {"echo", "hello"}); @@ -45,6 +48,7 @@ void execute_whenCommandCompletedSuccessfully_thenPrintResult() throws IOExcepti } @Test + @DisabledOnOs(OS.WINDOWS) void execute_whenCommandFailed_thenThrowException() { // Given TestCommand testCommand = new TestCommand(kitLogger, new String[] {"ls", "idontexist"}); @@ -86,6 +90,7 @@ protected void processError(String errorLine) { } @Test + @DisabledOnOs(OS.WINDOWS) void execute_whenWorkDirProvided_thenUseWorkDir(@TempDir File temporaryFolder) throws IOException { // Given TestCommand testCommand = new TestCommand(kitLogger, new String[] {"touch", "foo"}, temporaryFolder); diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/archive/ArchiveDecompressorTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/archive/ArchiveDecompressorTest.java index ce5016fc28..543c366daa 100644 --- a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/archive/ArchiveDecompressorTest.java +++ b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/archive/ArchiveDecompressorTest.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.nio.file.Files; +import static org.apache.commons.io.FilenameUtils.separatorsToSystem; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; class ArchiveDecompressorTest { @@ -66,7 +67,7 @@ void extractArchive_whenArchiveWithNestedDir_thenExtractToSpecifiedDir(String fi FileAssertions.assertThat(tempDir) .exists() .fileTree() - .containsExactlyInAnyOrder(parentDir, artifactParentDir, artifact); + .containsExactlyInAnyOrder(parentDir, separatorsToSystem(artifactParentDir), separatorsToSystem(artifact)); } @Test diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/IoUtilTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/IoUtilTest.java index 7df8af6808..da4ca67e6b 100644 --- a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/IoUtilTest.java +++ b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/IoUtilTest.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import static org.apache.commons.io.FilenameUtils.separatorsToSystem; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIOException; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -140,7 +141,7 @@ void downloadArchive_whenUnixArtifactProvided_thenDownloadAndExtract() throws IO FileAssertions.assertThat(temporaryFolder) .exists() .fileTree() - .containsExactlyInAnyOrder("linux-amd64", "linux-amd64/foo"); + .containsExactlyInAnyOrder("linux-amd64", separatorsToSystem("linux-amd64/foo")); } } diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SerializationTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SerializationTest.java index 9bd87f1b60..a46bcb117b 100644 --- a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SerializationTest.java +++ b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SerializationTest.java @@ -157,16 +157,16 @@ void asJson_withConfigMap_returnsJsonString() { final String result = Serialization.asJson(source); // Then assertThat(result) - .isEqualTo("{\n" + - " \"apiVersion\" : \"v1\",\n" + - " \"kind\" : \"ConfigMap\",\n" + - " \"metadata\" : {\n" + - " \"name\" : \"test\"\n" + - " },\n" + - " \"data\" : {\n" + - " \"key\" : \"value\"\n" + - " }\n" + - "}"); + .isEqualTo(String.format("{%n" + + " \"apiVersion\" : \"v1\",%n" + + " \"kind\" : \"ConfigMap\",%n" + + " \"metadata\" : {%n" + + " \"name\" : \"test\"%n" + + " },%n" + + " \"data\" : {%n" + + " \"key\" : \"value\"%n" + + " }%n" + + "}")); } @Test @@ -182,16 +182,16 @@ void saveJson_withConfigMap_savesFile(@TempDir Path targetDir) throws IOExceptio // Then assertThat(targetFile) .content() - .isEqualTo("{\n" + - " \"apiVersion\" : \"v1\",\n" + - " \"kind\" : \"ConfigMap\",\n" + - " \"metadata\" : {\n" + - " \"name\" : \"test\"\n" + - " },\n" + - " \"data\" : {\n" + - " \"key\" : \"value\"\n" + - " }\n" + - "}"); + .isEqualTo(String.format("{%n" + + " \"apiVersion\" : \"v1\",%n" + + " \"kind\" : \"ConfigMap\",%n" + + " \"metadata\" : {%n" + + " \"name\" : \"test\"%n" + + " },%n" + + " \"data\" : {%n" + + " \"key\" : \"value\"%n" + + " }%n" + + "}")); } @Test