Changeset 6568 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2013-12-30T23:57:06+01:00 (10 years ago)

Author:

simon04

Message:

fix #9462 - fix preset values for opening_hour/… such that the OpeningHourTest does not yield warnings, add unit test that validates all preset values

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

@@ -5 +5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import static org.CustomMatchers.hasSize;
@@ -128 +139 @@
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 13:30, 17:45, 19:00; Sa 15:00; Su 11:00", OpeningHourTest.CheckMode.BOTH).get(0).getPrettifiedValue(), is("Mo-Fr 13:30,17:45,19:00; Sa 15:00; Su 11:00"));
     }
+
+    @Test
+    public void testPresetValues() throws Exception {
+        final Collection<TaggingPreset> presets = TaggingPresetReader.readFromPreferences(false);
+        final Set<Tag> values = new LinkedHashSet<Tag>();
+        for (final TaggingPreset p : presets) {
+            for (final TaggingPresetItem i : p.data) {
+                if (i instanceof TaggingPresetItems.KeyedItem &&
+                        Arrays.asList("opening_hours", "service_times", "collection_times").contains(((TaggingPresetItems.KeyedItem) i).key)) {
+                    for (final String v : ((TaggingPresetItems.KeyedItem) i).getValues()) {
+                        values.add(new Tag(((TaggingPresetItems.KeyedItem) i).key, v));
+                    }
+                }
+            }
+        }
+        for (final Tag t : values) {
+            final List<OpeningHourTest.OpeningHoursTestError> errors = OPENING_HOUR_TEST.checkOpeningHourSyntax(t.getKey(), t.getValue());
+            assertThat(t + " is valid", errors, isEmpty());
+        }
+    }
 }