Changeset 7100 in josm for trunk/test


Ignore:
Timestamp:
2014-05-11T01:01:33+02:00 (6 years ago)
Author:
Don-vip
Message:

refactor tagging presets to allow presets-dependent unit tests to update them correctly at runtime

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

    r7098 r7100  
    1919import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    2020import org.openstreetmap.josm.data.osm.Relation;
    21 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
    2221import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
     22import org.openstreetmap.josm.gui.tagging.TaggingPresets;
    2323import org.openstreetmap.josm.io.Compression;
    2424import org.openstreetmap.josm.io.IllegalDataException;
     
    4949    public void testTicket9632() throws IllegalDataException, IOException, SAXException {
    5050        String source = "http://josm.openstreetmap.de/josmfile?page=Presets/BicycleJunction&preset";
    51         TaggingPresetPreference.taggingPresets = TaggingPresetReader.readAll(source, true);
     51        TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll(source, true));
    5252
    5353        Comparator<Relation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
Note: See TracChangeset for help on using the changeset viewer.