Changeset 294 in josm for test

Timestamp:

2007-07-20T17:21:38+02:00 (16 years ago)

Author:

imi

Message:

• renamed annotation presets to tagging presets

Location:

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

Files:

• . (moved) (moved from test/unit/org/openstreetmap/josm/gui/annotation)
• AnnotationPresetTest.java (deleted)
• TaggingPresetTest.java (copied) (copied from test/unit/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java) (3 diffs)
• annotation-test.xml (deleted)
• taggingpreset-test.xml (copied) (copied from test/unit/org/openstreetmap/josm/gui/annotation/annotation-test.xml)

test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetTest.java

@@ -1 @@
-package org.openstreetmap.josm.gui.annotation;
+package org.openstreetmap.josm.gui.tagging;
 
 import java.io.ByteArrayInputStream;
@@ -11 +11 @@
 import junit.framework.TestCase;
 
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Check;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Combo;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Key;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Check;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Combo;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Key;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Label;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset.Text;
 
-public class AnnotationPresetTest extends TestCase {
+public class TaggingPresetTest extends TestCase {
 
-        public void testAnnotationPresetLoads() throws Exception {
-                InputStream in = getClass().getResourceAsStream("annotation-test.xml");
-                List<AnnotationPreset> all = AnnotationPreset.readAll(in);
+        public void testTaggingPresetLoads() throws Exception {
+                InputStream in = getClass().getResourceAsStream("taggingpreset-test.xml");
+                List<TaggingPreset> all = TaggingPreset.readAll(in);
 
                 assertEquals(1, all.size());
-                AnnotationPreset a = all.get(0);
+                TaggingPreset a = all.get(0);
                 assertEquals("Highway", a.getValue(Action.NAME));
                 Field dataField = a.getClass().getDeclaredField("data");
@@ -60 +61 @@
         public void testIconLoadsFromClasspath() throws Exception {
                 String xml = "<annotations><item icon='logo'></item></annotations>";
-                List<AnnotationPreset> all = AnnotationPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
+                List<TaggingPreset> all = TaggingPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
 
                 assertEquals(1, all.size());