Changeset 6562 in josm for trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java

Timestamp:

2013-12-29T14:14:58+01:00 (10 years ago)

Author:

simon04

Message:

fix #9327 - tagging presets: fix handling of nested <reference>s, refactor railway presets

File:

• trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.tagging;
-
-import java.io.IOException;
-import java.util.Collection;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.TestUtils;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import static org.CustomMatchers.hasSize;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
 /**
@@ -16 +22 @@
  */
 public class TaggingPresetReaderTest {
-    /**
-     * path to test data root directory
-     */
-    private static String testdataroot;
-    
+
     @BeforeClass
     public static void setUpClass() {
         Main.initApplicationPreferences();
-        testdataroot = System.getProperty("josm.test.data");
-        if (testdataroot == null || testdataroot.isEmpty()) {
-            testdataroot = "test/data";
-            System.out.println("System property josm.test.data is not set, using '" + testdataroot + "'");
-        }
     }
 
@@ -37 +34 @@
      */
     protected static String getRegressionDataDir(int ticketid) {
-        return testdataroot + "/regress/" + ticketid;
+        return TestUtils.getTestDataRoot() + "/regress/" + ticketid;
     }
 
@@ -64 +61 @@
     }
 
+    @Test
+    public void testNestedChunks() throws Exception {
+        final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(TestUtils.getTestDataRoot() + "preset_chunk.xml", true);
+        assertThat(presets, hasSize(1));
+        final TaggingPreset abc =  presets.iterator().next();
+        final List<String> keys = Utils.transform(abc.data, new Utils.Function<TaggingPresetItem, String>() {
+            @Override
+            public String apply(TaggingPresetItem x) {
+                return ((TaggingPresetItems.Key) x).key;
+            }
+        });
+        assertThat(keys.toString(), is("[A1, A2, A3, B1, B2, B3, C1, C2, C3]"));
+    }
+
     /**
      * Validate internal presets