OS is now passed consequently as param. Now also the path separators …

…are properly created regardless of the test exec OS.

app/src/main/java/com/oracle/javafx/scenebuilder/app/AppPlatform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022 Gluon and/or its affiliates.
+ * Copyright (c) 2017, 2024 Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -37,6 +37,7 @@
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
@@ -62,8 +63,14 @@ public class AppPlatform {
     private static MessageBox<MessageBoxMessage> messageBox;
 
     public static synchronized String getApplicationDataFolder() {
-        return getApplicationDataFolder(System.getenv(), System.getProperties(), OS.get(),
-                AppSettings.getSceneBuilderVersion());
+        return getApplicationDataFolder(OS.get());
+    }
+
+    static synchronized String getApplicationDataFolder(OS operatingSystem) {
+        return getApplicationDataFolder(System.getenv(),
+                                        System.getProperties(),
+                                        operatingSystem,
+                                        AppSettings.getSceneBuilderVersion());
     }
 
     static synchronized String getApplicationDataFolder(Map<String, String> sysenv, Properties system,
@@ -107,9 +114,9 @@ public static synchronized String getUserLibraryFolder() {
     static synchronized String getUserLibraryFolder(OS operatingSystem) {
         if (userLibraryFolder == null) {
             if (OS.WINDOWS.equals(operatingSystem)) {
-                userLibraryFolder = getApplicationDataFolder() + "\\" + "Library"; // NOI18N
+                userLibraryFolder = getApplicationDataFolder(operatingSystem) + "\\" + "Library"; // NOI18N
             } else {
-                userLibraryFolder = getApplicationDataFolder() + "/" + "Library"; // NOI18N
+                userLibraryFolder = getApplicationDataFolder(operatingSystem) + "/" + "Library"; // NOI18N
             }
         }
         return userLibraryFolder;
@@ -122,12 +129,16 @@ static synchronized String getUserLibraryFolder(OS operatingSystem) {
      * @return Directory path for Scene Builder logs
      */
     public static synchronized String getLogFolder() {
-        return getLogFolder(System.getProperties());
+        return getLogFolder(System.getProperties(), OS.get());
     }
 
-    static synchronized String getLogFolder(Properties system) {
+    static synchronized String getLogFolder(Properties system, OS operatingSystem) {
         if (logsFolder == null) {
-            logsFolder = Paths.get(system.getProperty("user.home"), ".scenebuilder", "logs").toString(); //NOI18N
+            if (OS.WINDOWS.equals(operatingSystem)) {
+                logsFolder = system.getProperty("user.home") + "\\.scenebuilder\\logs"; //NOI18N
+            } else {
+                logsFolder = system.getProperty("user.home") + "/.scenebuilder/logs"; //NOI18N
+            }
         }
         return logsFolder;
     }
@@ -196,10 +207,17 @@ private static synchronized boolean requestStartGeneric(
     }
 
     protected static String getMessageBoxFolder() {
+        return getMessageBoxFolder(OS.get());
+    }
+
+    protected static String getMessageBoxFolder(OS operatingSystem) {
         if (messageBoxFolder == null) {
-            messageBoxFolder = getApplicationDataFolder() + "/MB"; //NOI18N
+            if (OS.WINDOWS.equals(operatingSystem)) {
+                messageBoxFolder = getApplicationDataFolder() + "\\MB"; //NOI18N
+            } else {
+                messageBoxFolder = getApplicationDataFolder() + "/MB"; //NOI18N
+            }
         }
-
         return messageBoxFolder;
     }
 

app/src/test/java/com/oracle/javafx/scenebuilder/app/AppPlatformTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022 Gluon and/or its affiliates.
+ * Copyright (c) 2016, 2024 Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -85,26 +85,23 @@ void that_library_path_is_subdir_of_appdata() {
     }
 
     @Test
-    @EnabledOnOs(value = org.junit.jupiter.api.condition.OS.WINDOWS)
     void that_application_settings_directory_is_created_properly_on_windows() {
-        Path appDir = Path.of(AppPlatform.getApplicationDataFolder());
+        Path appDir = Path.of(AppPlatform.getApplicationDataFolder(OS.WINDOWS));
         Path expected = Path.of(System.getenv("APPDATA") + "\\Scene Builder\\" + AppSettings.getSceneBuilderVersion());
         assertEquals(expected, appDir);
     }
 
     @Test
-    @EnabledOnOs(value = org.junit.jupiter.api.condition.OS.LINUX)
     void that_application_settings_directory_is_created_properly_on_linux() {
-        Path appDir = Path.of(AppPlatform.getApplicationDataFolder());
+        Path appDir = Path.of(AppPlatform.getApplicationDataFolder(OS.LINUX));
         Path expected = Path
                 .of(System.getProperty("user.home") + "/.scenebuilder/" + AppSettings.getSceneBuilderVersion());
         assertEquals(expected, appDir);
     }
 
     @Test
-    @EnabledOnOs(value = org.junit.jupiter.api.condition.OS.MAC)
     void that_application_settings_directory_is_created_properly_on_mac() {
-        Path appDir = Path.of(AppPlatform.getApplicationDataFolder());
+        Path appDir = Path.of(AppPlatform.getApplicationDataFolder(OS.MAC));
         Path expected = Path.of(System.getProperty("user.home") + "/Library/Application Support/Scene Builder/"
                 + AppSettings.getSceneBuilderVersion());
         assertEquals(expected, appDir);
@@ -122,7 +119,7 @@ void that_user_library_folder_resides_in_applications_data_folder() {
     void that_messagebox_folder_resides_in_applications_data_folder() {
         // init app data folder first as this is the basis
         AppPlatform.getApplicationDataFolder(testEnvironment, testProperties, OS.WINDOWS, "19.0.0-SNAPSHOT");
-        Path messageBoxDir = Path.of(AppPlatform.getMessageBoxFolder());
+        Path messageBoxDir = Path.of(AppPlatform.getMessageBoxFolder(OS.WINDOWS));
         Path expectedDir = Path.of("C:\\Users\\UserName\\AppData\\Roaming\\Scene Builder\\19.0.0-SNAPSHOT\\MB");
         assertEquals(expectedDir, messageBoxDir);
     }