fix: path separator in vfs (#19061)

Fix decision on file separator character according to string instead of OS. Fix ide test to use same format for file path. Fixes #19046
vaadin · Mar 28, 2024 · f817aa0 · f817aa0
1 parent 5675604
commit f817aa0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/vaadin-dev-server/src/main/java/com/vaadin/base/devserver/startup/DevModeInitializer.java b/vaadin-dev-server/src/main/java/com/vaadin/base/devserver/startup/DevModeInitializer.java
@@ -469,7 +469,7 @@ private static File getPhysicalFileOfJBossVfsJar(URL url)
             String vfsJarPath = url.toString();
             String fileNamePrefix = vfsJarPath.substring(
                     vfsJarPath.lastIndexOf(
-                            FrontendUtils.isWindows() ? '\\' : '/') + 1,
+                            vfsJarPath.contains("\\") ? '\\' : '/') + 1,
                     vfsJarPath.lastIndexOf(".jar"));
             Path tempJar = Files.createTempFile(fileNamePrefix, ".jar");
 

diff --git a/vaadin-dev-server/src/test/java/com/vaadin/base/devserver/OpenInCurrentIdeTest.java b/vaadin-dev-server/src/test/java/com/vaadin/base/devserver/OpenInCurrentIdeTest.java
@@ -9,9 +9,12 @@
 import java.util.Optional;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import com.vaadin.open.OSUtils;
+
 public class OpenInCurrentIdeTest {
 
     @Test
@@ -46,7 +49,8 @@ public void ideaOnMacDetected() throws IOException {
         // The binary on Mac is /.../IntelliJ IDEA.app/Contents/MacOS/idea
         Assert.assertEquals(
                 new File(baseDirectory, "MacOS/idea").getAbsolutePath(),
-                OpenInCurrentIde.getBinary(ideCommand.get()));
+                new File(OpenInCurrentIde.getBinary(ideCommand.get()))
+                        .getAbsolutePath());
 
     }
 
@@ -605,6 +609,8 @@ private Info mock(String cmd, String cmdline) {
 
     @Test
     public void runThrowsExceptionOnFailure() throws InterruptedException {
+        Assume.assumeFalse(OSUtils.isWindows());
+
         try {
             OpenInCurrentIde.run("/bin/sh", "-c",
                     "echo 'output1'; echo 'output2'; exit 123");