Changeset 11272 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2016-11-17T21:00:49+01:00 (7 years ago)

Author:

michael2402

Message:

See #13361: Cleanup code and formatting

• Add javadoc to public methods
• Add @since tag to newer methods
• Do not use if (...) return true; else return false;
• Remove parentheses if they are not required
• Use blocks for if-statements which is more consistent with most of JOSM code

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java

@@ -52 +52 @@
         assertTrue(b1.bounds(b2));
 
-        // invalid latlon values
-        LatLon invalid1 = new LatLon(-190, 340);
-        BBox b3 = new BBox(invalid1, latLon1);
-        BBox b4 = new BBox(latLon1, invalid1);
-        BBox b5 = new BBox(invalid1, invalid1);
-        // what should be the result?
+        // outside of world latlon values
+        LatLon outOfWorld = new LatLon(-190, 340);
+        BBox b3 = new BBox(outOfWorld, latLon1);
+        BBox b4 = new BBox(latLon1, outOfWorld);
+        BBox b5 = new BBox(outOfWorld, outOfWorld);
+
         assertTrue(b3.isValid());
         assertTrue(b4.isValid());
@@ -63 +63 @@
         assertTrue(b4.bounds(latLon1));
         assertTrue(b5.isValid());
+        assertFalse(b3.isInWorld());
+        assertFalse(b4.isInWorld());
         assertFalse(b5.isInWorld());
     }