Changeset 71 in josm for test

Timestamp:

2006-03-25T16:21:09+01:00 (19 years ago)

Author:

imi

Message:

• refactored GpsPoint to be immutable and added LatLon and NorthEast
• refactored Bounding Box calculations
• various other renames

Location:

test/org/openstreetmap/josm/test

Files:

• GpxWriterTest.java (modified) (2 diffs)
• MergeVisitorTest.java (modified) (3 diffs)
• OsmWriterTest.java (modified) (2 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.waies.iterator().next().setDeleted(true);
+                ds.ways.iterator().next().setDeleted(true);
                 root = reparse();
                 assertEquals("way has vanished and 3 trk (segments) left", 3, root.getChildren("trk", GPX).size());
@@ -56 +56 @@
                 assertNotNull("way not found in GPX file", realWay);
                 
-                // the second point of the first segment of the waies has an id
+                // the second point of the first segment of the ways has an id
                 Element trkseg = (Element)realWay.getChildren("trkseg", GPX).get(0);
                 Element trkpt = (Element)trkseg.getChildren("trkpt", GPX).get(1);

test/org/openstreetmap/josm/test/MergeVisitorTest.java

@@ -3 +3 @@
 import junit.framework.TestCase;
 
-import org.openstreetmap.josm.data.GeoPoint;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.LineSegment;
@@ -25 +25 @@
                 ls1.id = 3;
 
-                Node newnode = new Node(new GeoPoint(n[1].coor.lat, n[1].coor.lon));
+                Node newnode = new Node(new LatLon(n[1].coor.lat(), n[1].coor.lon()));
                 LineSegment newls = new LineSegment(n[0], newnode);
 
@@ -47 +47 @@
                 DataSet ds2 = new DataSet();
                 Node n2[] = createNodes(ds2, 2);
-                n2[0].coor = new GeoPoint(n[0].coor.lat, n[0].coor.lon);
+                n2[0].coor = new LatLon(n[0].coor.lat(), n[0].coor.lon());
                 n2[1].id = 42;
                 LineSegment ls2 = DataSetTestCaseHelper.createLineSegment(ds, n2[0], n2[1]);

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

@@ -53 +53 @@
                 reparse();
                 assertEquals(42, Long.parseLong(getAttr(osm, "node", 0, "id")));
-                assertEquals(n.coor.lat, Double.parseDouble(getAttr(osm, "node", 0, "lat")));
-                assertEquals(n.coor.lon, Double.parseDouble(getAttr(osm, "node", 0, "lon")));
+                assertEquals(n.coor.lat(), Double.parseDouble(getAttr(osm, "node", 0, "lat")));
+                assertEquals(n.coor.lon(), Double.parseDouble(getAttr(osm, "node", 0, "lon")));
         }
 
@@ -125 +125 @@
         @Bug(47)
         public void testDeleteNewDoesReallyRemove() throws Exception {
-                ds.waies.iterator().next().setDeleted(true);
+                ds.ways.iterator().next().setDeleted(true);
                 reparse();
                 //assertEquals(0, deleted.size());

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

@@ -3 +3 @@
 import java.util.Arrays;
 
-import org.openstreetmap.josm.data.GeoPoint;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.LineSegment;
@@ -42 +42 @@
                 Way t = new Way();
                 t.segments.addAll(Arrays.asList(lineSegments));
-                ds.waies.add(t);
+                ds.ways.add(t);
                 return t;
         }
@@ -59 +59 @@
          */
         public static Node createNode(DataSet ds) {
-                Node node = new Node(new GeoPoint(Math.random(), Math.random()));
+                Node node = new Node(new LatLon(Math.random(), Math.random()));
                 ds.nodes.add(node);
                 return node;