Changeset 64 in josm for test/org

Timestamp:

2006-03-16T19:35:44+01:00 (20 years ago)

Author:

imi

Message:

• renamed track to way
• refactored Key to be a simple String
• fixed PropertyDialog which displayed <different> for doubled values

Location:

test/org/openstreetmap/josm/test

Files:

• GpxWriterTest.java (modified) (3 diffs)
• OsmWriterTest.java (modified) (5 diffs)
• framework/DataSetTestCaseHelper.java (modified) (3 diffs)

test/org/openstreetmap/josm/test/GpxWriterTest.java

@@ -31 +31 @@
         @Bug(47)
         public void testDeleteNewDoesReallyRemove() throws JDOMException, IOException {
-                ds.tracks.iterator().next().setDeleted(true);
+                ds.waies.iterator().next().setDeleted(true);
                 root = reparse();
-                assertEquals("track has vanished and 3 trk (segments) left", 3, root.getChildren("trk", GPX).size());
+                assertEquals("way has vanished and 3 trk (segments) left", 3, root.getChildren("trk", GPX).size());
         }
 
@@ -44 +44 @@
         public void testNewCreateAddIdWhenMoreThanOnce() {
                 // the trk with the two trkseg's only occoure once -> no extension id
-                Element realTrack = null;
+                Element realWay = null;
                 for (Object o : root.getChildren("trk", GPX)) {
                         Element e = (Element)o;
@@ -51 +51 @@
                         Element ext = e.getChild("extensions", GPX);
                         if (ext != null)
-                                assertEquals("no id for track (used only once)", 0, ext.getChildren("uid", JOSM).size());
-                        realTrack = e;
+                                assertEquals("no id for way (used only once)", 0, ext.getChildren("uid", JOSM).size());
+                        realWay = e;
                 }
-                assertNotNull("track not found in GPX file", realTrack);
+                assertNotNull("way not found in GPX file", realWay);
                 
-                // the second point of the first segment of the tracks has an id
-                Element trkseg = (Element)realTrack.getChildren("trkseg", GPX).get(0);
+                // the second point of the first segment of the waies has an id
+                Element trkseg = (Element)realWay.getChildren("trkseg", GPX).get(0);
                 Element trkpt = (Element)trkseg.getChildren("trkpt", GPX).get(1);
-                assertEquals("trackpoint used twice but has no extensions at all", 1, trkpt.getChildren("extensions", GPX).size());
+                assertEquals("waypoint used twice but has no extensions at all", 1, trkpt.getChildren("extensions", GPX).size());
                 Element ext = trkpt.getChild("extensions", GPX);
-                assertEquals("trackpoint used twice but has no id", 1, ext.getChildren("uid", JOSM).size());
+                assertEquals("waypoint used twice but has no id", 1, ext.getChildren("uid", JOSM).size());
         }
 

test/org/openstreetmap/josm/test/OsmWriterTest.java

@@ -15 +15 @@
 import org.jdom.input.SAXBuilder;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Key;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.io.OsmWriter;
 import org.openstreetmap.josm.test.framework.Bug;
@@ -38 +37 @@
         private LineSegment ls2;
         private LineSegment ls3;
-        private Track w;
+        private Way w;
         
         private DataSet ds;
@@ -64 +63 @@
                         sb.append((char)i);
                 String s = sb.toString();
-                n1.put(Key.get(s), s);
+                n1.put(s, s);
                 reparse();
                 assertEquals(1, nodes.get(0).getChildren().size());
@@ -76 +75 @@
                 ds = new DataSet();
                 LineSegment ls = DataSetTestCaseHelper.createLineSegment(ds, DataSetTestCaseHelper.createNode(ds), DataSetTestCaseHelper.createNode(ds));
-                ls.put(Key.get("foo"), "bar");
+                ls.put("foo", "bar");
                 reparse();
                 assertEquals(1, lineSegments.size());
@@ -126 +125 @@
         @Bug(47)
         public void testDeleteNewDoesReallyRemove() throws Exception {
-                ds.tracks.iterator().next().setDeleted(true);
+                ds.waies.iterator().next().setDeleted(true);
                 reparse();
                 //assertEquals(0, deleted.size());

test/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.data.osm.Way;
 
 
@@ -23 +23 @@
          * - ls between node 1 and 2
          * - ls between node 3 and 4
-         * - a track with ls 0 and 1
+         * - a way with ls 0 and 1
          */
         public static DataSet createCommon() {
@@ -39 +39 @@
         }
 
-        public static Track createWay(DataSet ds, LineSegment... lineSegments) {
-                Track t = new Track();
+        public static Way createWay(DataSet ds, LineSegment... lineSegments) {
+                Way t = new Way();
                 t.segments.addAll(Arrays.asList(lineSegments));
-                ds.tracks.add(t);
+                ds.waies.add(t);
                 return t;
         }