Changeset 294 in josm for test


Ignore:
Timestamp:
2007-07-20T17:21:38+02:00 (14 years ago)
Author:
imi
Message:
  • renamed annotation presets to tagging presets
Location:
test/unit/org/openstreetmap/josm/gui/tagging
Files:
2 deleted
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetTest.java

    r291 r294  
    1 package org.openstreetmap.josm.gui.annotation;
     1package org.openstreetmap.josm.gui.tagging;
    22
    33import java.io.ByteArrayInputStream;
     
    1111import junit.framework.TestCase;
    1212
    13 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Check;
    14 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Combo;
    15 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Key;
    16 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
    17 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
     13import org.openstreetmap.josm.gui.tagging.TaggingPreset;
     14import org.openstreetmap.josm.gui.tagging.TaggingPreset.Check;
     15import org.openstreetmap.josm.gui.tagging.TaggingPreset.Combo;
     16import org.openstreetmap.josm.gui.tagging.TaggingPreset.Key;
     17import org.openstreetmap.josm.gui.tagging.TaggingPreset.Label;
     18import org.openstreetmap.josm.gui.tagging.TaggingPreset.Text;
    1819
    19 public class AnnotationPresetTest extends TestCase {
     20public class TaggingPresetTest extends TestCase {
    2021
    21         public void testAnnotationPresetLoads() throws Exception {
    22                 InputStream in = getClass().getResourceAsStream("annotation-test.xml");
    23                 List<AnnotationPreset> all = AnnotationPreset.readAll(in);
     22        public void testTaggingPresetLoads() throws Exception {
     23                InputStream in = getClass().getResourceAsStream("taggingpreset-test.xml");
     24                List<TaggingPreset> all = TaggingPreset.readAll(in);
    2425
    2526                assertEquals(1, all.size());
    26                 AnnotationPreset a = all.get(0);
     27                TaggingPreset a = all.get(0);
    2728                assertEquals("Highway", a.getValue(Action.NAME));
    2829                Field dataField = a.getClass().getDeclaredField("data");
     
    6061        public void testIconLoadsFromClasspath() throws Exception {
    6162                String xml = "<annotations><item icon='logo'></item></annotations>";
    62                 List<AnnotationPreset> all = AnnotationPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
     63                List<TaggingPreset> all = TaggingPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
    6364
    6465                assertEquals(1, all.size());
Note: See TracChangeset for help on using the changeset viewer.