Fix: Testing on presets-overhaul branch

SonarSonic · Feb 8, 2024 · 8f0bb61 · 8f0bb61
1 parent 3977e6a
commit 8f0bb61
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/drawingbot/files/json/AbstractPresetLoader.java b/src/main/java/drawingbot/files/json/AbstractPresetLoader.java
@@ -11,6 +11,7 @@
 import drawingbot.javafx.GenericPreset;
 import drawingbot.javafx.preferences.DBPreferences;
 import drawingbot.registry.MasterRegistry;
+import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
@@ -118,7 +119,7 @@ public void addPreset(GenericPreset<DATA> preset) {
 
         if(!isLoading()){
             markDirty();
-            sendListenerEvent(listener -> listener.onPresetAdded(preset));
+            Platform.runLater(() -> sendListenerEvent(listener -> listener.onPresetAdded(preset)));
         }
     }
 
@@ -139,7 +140,7 @@ public void removePreset(GenericPreset<DATA> preset) {
 
         if(!isLoading()){
             markDirty();
-            sendListenerEvent(listener -> listener.onPresetRemoved(preset));
+            Platform.runLater(() -> sendListenerEvent(listener -> listener.onPresetRemoved(preset)));
         }
 
     }
@@ -185,8 +186,8 @@ public GenericPreset<DATA> editPreset(GenericPreset<DATA> oldPreset, GenericPres
         }
 
         //Send out listener events and mark the presets as dirty
-        sendListenerEvent(listener -> listener.onPresetEdited(editPreset));
         markDirty();
+        Platform.runLater(() -> sendListenerEvent(listener -> listener.onPresetEdited(editPreset)));
         return result;
     }
 
@@ -298,7 +299,7 @@ public void markDirty() {
             JsonLoaderManager.INSTANCE.markDirty(this);
 
             //run later to prevent json update happen before services have been created
-            sendListenerEvent(Listener::onMarkDirty);
+            Platform.runLater(() -> sendListenerEvent(Listener::onMarkDirty));
         }
     }
 

diff --git a/src/test/java/drawingbot/JUnitDBV3ClassRunner.java b/src/test/java/drawingbot/JUnitDBV3ClassRunner.java
@@ -2,6 +2,7 @@
 
 import drawingbot.files.json.JsonLoaderManager;
 import drawingbot.javafx.preferences.DBPreferences;
+import drawingbot.javafx.util.JFXUtils;
 import javafx.application.Platform;
 import org.junit.Assert;
 import org.junit.runners.BlockJUnit4ClassRunner;
@@ -25,8 +26,10 @@ public JUnitDBV3ClassRunner(final Class<?> clazz) throws InitializationError{
 
     public static boolean setupTestDBV3Free(){
         TestUtils.lazySetupDirectories();
-        DBPreferences.INSTANCE.autoRunPFM.set(false);
-        JsonLoaderManager.loadDefaultPresetContainerJSON("pfm_unit_test.json");
+        JFXUtils.runNow(() -> {
+            DBPreferences.INSTANCE.autoRunPFM.set(false);
+            JsonLoaderManager.loadDefaultPresetContainerJSON("pfm_unit_test.json");
+        });
 
         //Load the default test image
         TestUtils.loadDefaultTestImage();

diff --git a/src/test/java/drawingbot/plotting/canvas/ObservableCanvasRegressionTest.java b/src/test/java/drawingbot/plotting/canvas/ObservableCanvasRegressionTest.java
@@ -120,7 +120,7 @@ public static void testCanvas(String testID, PFMFactory<?> factory, List<String>
 
             //Reset the canvas to default settings
             JFXUtils.runNow(() -> {
-                Register.PRESET_LOADER_DRAWING_AREA.getDefaultManager().tryApplyPreset(DrawingBotV3.context(), Register.PRESET_LOADER_DRAWING_AREA.getDefaultPreset());
+                Register.PRESET_LOADER_DRAWING_AREA.getDefaultPreset().applyPreset(DrawingBotV3.context());
             });
         }
     }