test: fixed failing tests (windows) in jkube-kit/config/service module (

#2803)
eclipse-jkube · Mar 18, 2024 · ddbf861 · ddbf861
1 parent e72e5d4
commit ddbf861
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.../org/eclipse/jkube/kit/config/service/kubernetes/JibBuildServiceBuildIntegrationTest.java b/.../org/eclipse/jkube/kit/config/service/kubernetes/JibBuildServiceBuildIntegrationTest.java
@@ -51,6 +51,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+import static org.apache.commons.io.FilenameUtils.separatorsToSystem;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -150,15 +151,15 @@ void build_withLayersAndArtifact_shouldPerformJibBuild() throws Exception {
         .containsExactlyInAnyOrder(
             "Dockerfile",
             "deployments-layer",
-            "deployments-layer/deployments",
-            "deployments-layer/deployments/to-deployments.txt",
+            separatorsToSystem("deployments-layer/deployments"),
+            separatorsToSystem("deployments-layer/deployments/to-deployments.txt"),
             "other-layer",
-            "other-layer/deployments",
-            "other-layer/deployments/other",
-            "other-layer/deployments/other/to-other.txt",
+            separatorsToSystem("other-layer/deployments"),
+            separatorsToSystem("other-layer/deployments/other"),
+            separatorsToSystem("other-layer/deployments/other/to-other.txt"),
             "jkube-generated-layer-final-artifact",
-            "jkube-generated-layer-final-artifact/deployments",
-            "jkube-generated-layer-final-artifact/deployments/final-artifact.jar",
+            separatorsToSystem("jkube-generated-layer-final-artifact/deployments"),
+            separatorsToSystem("jkube-generated-layer-final-artifact/deployments/final-artifact.jar"),
             "deployments"
         );
     ArchiveAssertions.assertThat(dockerDir.resolve("tmp").resolve("docker-build.tar").toFile())

diff --git a/.../org/eclipse/jkube/kit/config/service/openshift/OpenshiftBuildServiceIntegrationTest.java b/.../org/eclipse/jkube/kit/config/service/openshift/OpenshiftBuildServiceIntegrationTest.java
@@ -136,7 +136,7 @@ void init(@TempDir Path temporaryFolder) throws Exception {
         .thenReturn(new ArchiveService(AssemblyManager.getInstance(), logger));
     when(jKubeServiceHub.getBuildServiceConfig().getBuildDirectory()).thenReturn(target.getAbsolutePath());
     when(jKubeServiceHub.getConfiguration()).thenReturn(JKubeConfiguration.builder()
-        .outputDirectory(target.getAbsolutePath())
+        .outputDirectory(target.getName())
         .project(JavaProject.builder()
             .baseDirectory(baseDirectory)
             .buildDirectory(target)
@@ -238,7 +238,7 @@ void build_withDockerfileModeAndFlattenedAssembly_shouldThrowException() {
   @Test
   void build_withDockerfileModeAndAssembly_shouldSucceed() throws Exception {
     //Given
-    final File dockerFile = new File(target, "Dockerfile");
+    final File dockerFile = new File(baseDirectory, "Dockerfile");
     FileUtils.write(dockerFile, "FROM busybox\n", StandardCharsets.UTF_8);
     image.setBuild(BuildConfiguration.builder()
         .from(projectName)