Changeset 8450 in josm for trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java

Timestamp:

2015-06-03T01:27:41+02:00 (9 years ago)

Author:

Don-vip

Message:

unit tests - simplify assertions

File:

• trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
-
-import static org.junit.Assert.assertTrue;
 
 public class BoundsTest {
@@ -12 +14 @@
         Bounds b1 = new Bounds(0, 170, 50, -170);
         assertTrue(b1.crosses180thMeridian());
-        assertTrue(!b1.contains(new LatLon(-10, -180)));
+        assertFalse(b1.contains(new LatLon(-10, -180)));
         assertTrue(b1.contains(new LatLon(0, -180)));
         assertTrue(b1.contains(new LatLon(50, -180)));
-        assertTrue(!b1.contains(new LatLon(60, -180)));
-        assertTrue(!b1.contains(new LatLon(-10, 180)));
+        assertFalse(b1.contains(new LatLon(60, -180)));
+        assertFalse(b1.contains(new LatLon(-10, 180)));
         assertTrue(b1.contains(new LatLon(0, 180)));
         assertTrue(b1.contains(new LatLon(50, 180)));
-        assertTrue(!b1.contains(new LatLon(60, 180)));
+        assertFalse(b1.contains(new LatLon(60, 180)));
 
         Bounds b2 = new Bounds(60, 170, 90, -170);
-        assertTrue(!b1.intersects(b2));
-        assertTrue(!b2.intersects(b1));
+        assertFalse(b1.intersects(b2));
+        assertFalse(b2.intersects(b1));
 
         Bounds b3 = new Bounds(25, 170, 90, -170);
@@ -30 +32 @@
         assertTrue(b2.intersects(b3));
         assertTrue(b3.intersects(b2));
-        
+
         b3.extend(b1);
-        assertTrue(b3.equals(new Bounds(0, 170, 90, -170)));
+        assertEquals(b3, new Bounds(0, 170, 90, -170));
         assertTrue(b1.intersects(b3));
         assertTrue(b3.intersects(b1));
         assertTrue(b2.intersects(b3));
         assertTrue(b3.intersects(b2));
-        
+
         b3.extend(new LatLon(0, 0));
-        assertTrue(b3.equals(new Bounds(0, 0, 90, -170)));
+        assertEquals(b3, new Bounds(0, 0, 90, -170));
     }
 }