Changeset 15097 in josm

Timestamp:

2019-05-20T00:47:32+02:00 (6 years ago)

Author:

Don-vip

Message:

fix parallel execution of integration tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -63 +63 @@
  */
 public class ElemStyles implements PreferenceChangedListener {
-    private final List<StyleSource> styleSources;
+    private final List<StyleSource> styleSources = Collections.synchronizedList(new ArrayList<>());
     private boolean drawMultipolygon;
 
@@ -74 +74 @@
     private short defaultLinesIdx;
 
-    private final Map<String, String> preferenceCache = new HashMap<>();
+    private final Map<String, String> preferenceCache = Collections.synchronizedMap(new HashMap<>());
 
     private volatile Color backgroundColorCache;
@@ -82 +82 @@
      */
     public ElemStyles() {
-        styleSources = new ArrayList<>();
         Config.getPref().addPreferenceChangeListener(this);
     }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -23 +23 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.openstreetmap.josm.TestUtils;
@@ -30 +31 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.testutils.ParallelParameterized;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -40 +40 @@
  * Integration tests of {@link TaggingPresetPreference} class.
  */
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
 public class TaggingPresetPreferenceTestIT {