Changeset 7100 in josm for trunk/test/unit

Timestamp:

2014-05-11T01:01:33+02:00 (11 years ago)

Author:

Don-vip

Message:

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

File:

• trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.TaggingPresets;
 import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -49 +49 @@
     public void testTicket9632() throws IllegalDataException, IOException, SAXException {
         String source = "http://josm.openstreetmap.de/josmfile?page=Presets/BicycleJunction&preset";
-        TaggingPresetPreference.taggingPresets = TaggingPresetReader.readAll(source, true);
+        TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll(source, true));
 
         Comparator<Relation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();