fix test config

diylc/diylc-swing/src/test/java/org/diylc/RegressionTestRunner.java

@@ -19,7 +19,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
 import org.diylc.appframework.update.VersionNumber;
 import org.diylc.swingframework.export.DrawingExporter;
@@ -52,7 +51,7 @@ public class RegressionTestRunner {
     // System.err.println("Could not initialize log4j configuration: " + e.getMessage());
     // }
 
-    ConfigurationManager.getInstance().initialize("diylc-test");
+    TestConfiguration.initialize();
 
     String basePath = args[0];
     String command = args[1];

diylc/diylc-swing/src/test/java/org/diylc/TestBase.java

@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import org.apache.log4j.PropertyConfigurator;
-import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
 
 import org.diylc.common.ComponentType;
@@ -30,7 +29,7 @@ public class TestBase {
         System.err.println("Could not initialize log4j configuration: " + e.getMessage());
     }
     
-    ConfigurationManager.getInstance().initialize("diylc-test");
+    TestConfiguration.initialize();
     view = new MockView();
     presenter = new Presenter(view, InMemoryConfigurationManager.getInstance());
   }

diylc/diylc-swing/src/test/java/org/diylc/TestConfiguration.java

@@ -0,0 +1,102 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2025 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.util.Map;
+
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
+
+import org.diylc.serialization.ProjectFileManager;
+
+/**
+ * Gives a test a blank configuration: both the shared {@link ConfigurationManager} and the shared
+ * {@link InMemoryConfigurationManager} start empty on every call, with no listeners, so nothing a
+ * previous test or a previous run saved or registered can influence the next one. The
+ * configuration lives in a temporary directory, never in the user's own {@code ~/diylc}:
+ * initializing against the real {@code config.xml} copied it to a new
+ * {@code config.xml.<timestamp>} on every run that could not read it, and left that file exposed
+ * to whatever a test might write.
+ *
+ * @author Branislav Stojkovic
+ */
+public final class TestConfiguration {
+
+  private static final String APP_NAME = "diylc";
+
+  private static File directory;
+
+  private TestConfiguration() {}
+
+  public static synchronized void initialize() {
+    ConfigurationManager configurationManager = ConfigurationManager.getInstance();
+    if (directory == null) {
+      ProjectFileManager.configure(configurationManager.getSerializer());
+      try {
+        directory = Files.createTempDirectory("diylc-test").toFile();
+      } catch (IOException e) {
+        throw new IllegalStateException("Could not create a temporary configuration directory", e);
+      }
+    }
+    // initialize() reads back whatever an earlier test saved, and starts empty only without a file
+    new File(directory, APP_NAME + File.separator + "config.xml").delete();
+    // the configuration directory is resolved from user.home once, inside initialize()
+    String userHome = System.getProperty("user.home");
+    try {
+      System.setProperty("user.home", directory.getAbsolutePath());
+      configurationManager.initialize(APP_NAME);
+    } finally {
+      System.setProperty("user.home", userHome);
+    }
+    clearListeners(configurationManager);
+    resetInMemoryConfiguration();
+  }
+
+  // initialize() replaces the values but keeps the listeners, so objects from earlier tests, such
+  // as a CustomTreeModel nothing displays any more, would still react to this test's writes
+  private static void clearListeners(ConfigurationManager configurationManager) {
+    try {
+      Field listeners = ConfigurationManager.class.getDeclaredField("listeners");
+      listeners.setAccessible(true);
+      ((Map<?, ?>) listeners.get(configurationManager)).clear();
+    } catch (ReflectiveOperationException e) {
+      throw new IllegalStateException("Could not clear configuration listeners", e);
+    }
+  }
+
+  // InMemoryConfigurationManager offers no way to clear its singleton, which every presenter that
+  // tests create shares, including the one inside CloudSyncJob; getInstance() makes a new, empty
+  // one once the field is cleared
+  private static void resetInMemoryConfiguration() {
+    try {
+      Field instance = InMemoryConfigurationManager.class.getDeclaredField("instance");
+      instance.setAccessible(true);
+      instance.set(null, null);
+    } catch (ReflectiveOperationException e) {
+      throw new IllegalStateException("Could not reset the in-memory configuration", e);
+    }
+  }
+}

diylc/diylc-swing/src/test/java/org/diylc/swing/plugins/cloud/sync/CloudSyncJobTests.java

@@ -39,8 +39,8 @@ import org.junit.rules.TemporaryFolder;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
+import org.diylc.TestConfiguration;
 import org.diylc.common.DummyView;
 import org.diylc.plugins.cloud.model.IServiceAPI;
 import org.diylc.plugins.cloud.model.ProjectEntity;
@@ -196,7 +196,7 @@ public class CloudSyncJobTests {
   }
 
   private byte[] emptyProject() throws IOException {
-    ConfigurationManager.getInstance().initialize("diylc-test");
+    TestConfiguration.initialize();
     File file = folder.newFile("empty.diy");
     new Presenter(new DummyView(), InMemoryConfigurationManager.getInstance())
         .saveProjectToFile(file.getAbsolutePath(), false);