Changeset 15097 in josm


Ignore:
Timestamp:
2019-05-20T00:47:32+02:00 (5 months ago)
Author:
Don-vip
Message:

fix parallel execution of integration tests

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

    r15096 r15097  
    6363 */
    6464public class ElemStyles implements PreferenceChangedListener {
    65     private final List<StyleSource> styleSources;
     65    private final List<StyleSource> styleSources = Collections.synchronizedList(new ArrayList<>());
    6666    private boolean drawMultipolygon;
    6767
     
    7474    private short defaultLinesIdx;
    7575
    76     private final Map<String, String> preferenceCache = new HashMap<>();
     76    private final Map<String, String> preferenceCache = Collections.synchronizedMap(new HashMap<>());
    7777
    7878    private volatile Color backgroundColorCache;
     
    8282     */
    8383    public ElemStyles() {
    84         styleSources = new ArrayList<>();
    8584        Config.getPref().addPreferenceChangeListener(this);
    8685    }
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

    r15095 r15097  
    2323import org.junit.Test;
    2424import org.junit.runner.RunWith;
     25import org.junit.runners.Parameterized;
    2526import org.junit.runners.Parameterized.Parameters;
    2627import org.openstreetmap.josm.TestUtils;
     
    3031import org.openstreetmap.josm.spi.preferences.Config;
    3132import org.openstreetmap.josm.testutils.JOSMTestRules;
    32 import org.openstreetmap.josm.testutils.ParallelParameterized;
    3333import org.openstreetmap.josm.tools.ImageProvider;
    3434import org.openstreetmap.josm.tools.Logging;
     
    4040 * Integration tests of {@link TaggingPresetPreference} class.
    4141 */
    42 @RunWith(ParallelParameterized.class)
     42@RunWith(Parameterized.class)
    4343public class TaggingPresetPreferenceTestIT {
    4444
Note: See TracChangeset for help on using the changeset viewer.