Added both options for overrides

Stefterv · Stefterv · commit c6c7f974076b · 2025-11-20T10:48:14.000+01:00
- Added the previous settings override in base again
- Added a system property to override the settings folder within tests
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -2218,6 +2218,10 @@ static public InputStream getLibStream(String filename) throws IOException{
 * @deprecated use processing.utils.Settings.getFolder() instead, this method will invoke AWT
 */
 static public File getSettingsFolder(){
+ var override = getSettingsOverride();
+ if (override != null){
+ return override;
+ }
 try{
 return processing.utils.Settings.getFolder();
 } catch (processing.utils.Settings.SettingsFolderException e){
diff --git a/app/utils/src/main/java/processing/utils/Settings.java b/app/utils/src/main/java/processing/utils/Settings.java
@@ -18,7 +18,10 @@ public static File getFolder() throws SettingsFolderException{
 }
 
 private static File getFolderForPlatform() throws SettingsFolderException{
- // TODO: Detect override file,
+ var settingsOverride = System.getProperty("processing.settings.folder");
+ if (settingsOverride != null && !settingsOverride.isEmpty()){
+ return new File(settingsOverride);
+ }
 
 if (Platform.isWindows()){
 var options = new String[]{
diff --git a/app/utils/src/test/java/SettingsTest.java b/app/utils/src/test/java/SettingsTest.java
@@ -0,0 +1,40 @@
+import org.junit.jupiter.api.Test;
+import processing.utils.Settings;
+
+import java.io.IOException;
+import java.nio.file.Files;
+
+public class SettingsTest{
+
+ /**
+ * Requesting the settings folder should create it if it doesn't exist
+ */
+ @Test
+ public void testSettingsFolder(){
+ try{
+ var folder = Settings.getFolder();
+ assert (folder.exists());
+ } catch (Settings.SettingsFolderException e){
+ assert (false);
+ }
+ }
+
+ /**
+ * Overriding the settings folder via system property should work
+ */
+ @Test
+ public void testOverrideFolder() throws IOException{
+ var settings = Files.createTempDirectory("settings_test");
+ System.setProperty("processing.settings.folder", settings.toString());
+
+ try{
+ var folder = Settings.getFolder();
+ assert (folder.toPath().toString().equals(settings.toString()));
+ } catch (Settings.SettingsFolderException e){
+ assert (false);
+ } finally{
+ System.clearProperty("processing.settings.folder");
+ Files.deleteIfExists(settings);
+ }
+ }
+}

-Original file line number
+Diff line change
  * @deprecated use processing.utils.Settings.getFolder() instead, this method will invoke AWT
  */
 staticpublicFilegetSettingsFolder(){
 +varoverride = getSettingsOverride();
 +if (override != null){
 +returnoverride;
 + }
 try{
 returnprocessing.utils.Settings.getFolder();
  } catch (processing.utils.Settings.SettingsFolderExceptione){
-Original file line number
+Diff line change
@@ @@ -0,0 +1,40 @@ @@
 +importorg.junit.jupiter.api.Test;
 +importprocessing.utils.Settings;
++
 +importjava.io.IOException;
 +importjava.nio.file.Files;
++
 +publicclassSettingsTest{
++
 +/**
 + * Requesting the settings folder should create it if it doesn't exist
 + */
 +@Test
 +publicvoidtestSettingsFolder(){
 +try{
 +varfolder = Settings.getFolder();
 +assert (folder.exists());
 + } catch (Settings.SettingsFolderExceptione){
 +assert (false);
 + }
 + }
++
 +/**
 + * Overriding the settings folder via system property should work
 + */
 +@Test
 +publicvoidtestOverrideFolder() throwsIOException{
 +varsettings = Files.createTempDirectory("settings_test");
 +System.setProperty("processing.settings.folder", settings.toString());
++
 +try{
 +varfolder = Settings.getFolder();
 +assert (folder.toPath().toString().equals(settings.toString()));
 + } catch (Settings.SettingsFolderExceptione){
 +assert (false);
 + } finally{
 +System.clearProperty("processing.settings.folder");
 +Files.deleteIfExists(settings);
 + }
 + }
 +}