Changeset 6208 in josm for trunk

Timestamp:

2013-08-30T01:19:26+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9027 - fix error in internal preset introduced in r6195 (patch by skyper) + validation check in build.xml and junit test (patch by AlfonZ)

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• data/defaultpresets.xml (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java (modified) (1 diff)

trunk/build.xml

@@ -62 +62 @@
 </echo>
     </target>
-    <target name="dist" depends="compile,create-revision">
+    <target name="check-schemas">
+        <schemavalidate file="data/defaultpresets.xml" >
+            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="data/tagging-preset.xsd" />
+        </schemavalidate>
+        <schemavalidate file="styles/standard/elemstyles.xml" >
+            <schema namespace="http://josm.openstreetmap.de/mappaint-style-1.0" file="data/mappaint-style.xsd" />
+        </schemavalidate>
+    </target>
+    <target name="dist" depends="compile,create-revision,check-schemas">
         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
             <env key="LANG" value="C"/>

trunk/data/defaultpresets.xml

@@ -4421 +4421 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
-            <label text="Edit Skating" />
-            <key key="sport" value="skating" values_context="sport" />
+            <label text="Edit Skating" text_context="sport" />
+            <key key="sport" value="skating" />
             <text key="name" text="Name" />
             <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />

trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java

@@ -64 +64 @@
     }
 
+    /**
+     * Validate internal presets
+     * See #9027
+     */
+    @Test
+    public void readDefaulPresets() throws SAXException, IOException {
+        String presetfile = "resource://data/defaultpresets.xml";
+        final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, true);
+        Assert.assertTrue("Default presets are empty", presets.size()>0);
+    }
+    
 }