Changeset 6226 in josm for trunk

Timestamp:

2013-09-09T01:12:38+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9057 - see #8987 - fix Coordinate.hashCode() broken in r6162

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/coor/Coordinate.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Storage.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/validation (added)
• test/unit/org/openstreetmap/josm/data/validation/tests (added)
• test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java (added)

trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java

@@ -116 +116 @@
     public int hashCode() {
         final int prime = 31;
-        int result = super.hashCode();
+        int result = 1;
         long temp;
         temp = java.lang.Double.doubleToLongBits(x);

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -150 +150 @@
      * @param capacity
      * @param safeIterator If set to false, you must not modify the Storage
-     *          while iterating over it. If set to true, you can savely
+     *          while iterating over it. If set to true, you can safely
      *          modify, but the read-only iteration will happen on a copy
      *          of the unmodified Storage.

trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

@@ -21 +21 @@
            };
     
+    /**
+     * Test of {@link LatLon#roundToOsmPrecisionStrict}
+     */
     @Test
-    public void roundingTests() {
+    public void testRoundToOsmPrecisionStrict() {
         
         for (double value : sampleValues) {
@@ -74 +77 @@
     }
     
+    /**
+     * Test of {@link LatLon#toIntervalLon}
+     */
     @Test
-    public void toIntervalLonTests() {
+    public void testToIntervalLon() {
         assertEquals(-180.0, LatLon.toIntervalLon(-180.0), 0);
         assertEquals(0.0, LatLon.toIntervalLon(0.0), 0);
@@ -95 +101 @@
         assertEquals(179.0, LatLon.toIntervalLon(-541.0), 0);
     }
+
+    /**
+     * Test of {@link LatLon#equals}
+     */
+    @Test
+    public void testEquals() {
+        for (int i = 1; i < sampleValues.length; i++) {
+            LatLon a = new LatLon(sampleValues[i-1], sampleValues[i]);
+            LatLon b = new LatLon(sampleValues[i-1], sampleValues[i]);
+            assertEquals(a, b);
+        }
+    }
+
+    /**
+     * Test of {@link LatLon#hashCode}
+     */
+    @Test
+    public void testHashCode() {
+        for (int i = 1; i < sampleValues.length; i++) {
+            LatLon a = new LatLon(sampleValues[i-1], sampleValues[i]);
+            LatLon b = new LatLon(sampleValues[i-1], sampleValues[i]);
+            assertEquals(a.hashCode(), b.hashCode());
+        }
+    }
 }