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

Timestamp:

2015-10-12T22:58:25+02:00 (9 years ago)

Author:

Don-vip

Message:

major code cleanup/refactoring of tagging presets: slay the monster TaggingPresetItems (60 Kb, 1600 lines) and extract all its internal classes to a new package gui.tagging.presets.items

Location:

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets

Files:

• . (added)
• TaggingPresetReaderTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java ) (6 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.tagging;
+package org.openstreetmap.josm.gui.tagging.presets;
 
 import static org.CustomMatchers.hasSize;
@@ -15 +15 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.tagging.presets.items.Check;
+import org.openstreetmap.josm.gui.tagging.presets.items.Key;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
@@ -33 +35 @@
     /**
      * #8954 - last checkbox in the preset is not added
+     * @throws SAXException if any XML error occurs
+     * @throws IOException if any I/O error occurs
      */
     @Test
@@ -42 +46 @@
         Assert.assertEquals("Number of entries", 1, preset.data.size());
         final TaggingPresetItem item = preset.data.get(0);
-        Assert.assertTrue("Entry is not checkbox", item instanceof TaggingPresetItems.Check);
+        Assert.assertTrue("Entry is not checkbox", item instanceof Check);
     }
 
+    /**
+     * Test nested chunks
+     * @throws SAXException if any XML error occurs
+     * @throws IOException if any I/O error occurs
+     */
     @Test
-    public void testNestedChunks() throws Exception {
+    public void testNestedChunks() throws SAXException, IOException {
         final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(TestUtils.getTestDataRoot() + "preset_chunk.xml", true);
         assertThat(presets, hasSize(1));
@@ -53 +62 @@
             @Override
             public String apply(TaggingPresetItem x) {
-                return ((TaggingPresetItems.Key) x).key;
+                return ((Key) x).key;
             }
         });
@@ -62 +71 @@
      * Validate internal presets
      * See #9027
+     * @throws SAXException if any XML error occurs
+     * @throws IOException if any I/O error occurs
      */
     @Test