Changeset 8450 in josm for trunk/test/unit/org/openstreetmap/josm/io

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/io/session/SessionReaderTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -64 +66 @@
         for (String file : new String[]{"osm.jos", "osm.joz"}) {
             List<Layer> layers = testRead(file);
-            assertTrue(layers.size() == 1);
+            assertSame(layers.size(), 1);
             assertTrue(layers.get(0) instanceof OsmDataLayer);
             OsmDataLayer osm = (OsmDataLayer) layers.get(0);
@@ -80 +82 @@
         for (String file : new String[]{"gpx.jos", "gpx.joz", "nmea.jos"}) {
             List<Layer> layers = testRead(file);
-            assertTrue(layers.size() == 1);
+            assertSame(layers.size(), 1);
             assertTrue(layers.get(0) instanceof GpxLayer);
             GpxLayer gpx = (GpxLayer) layers.get(0);
@@ -95 +97 @@
     public void testReadGpxAndMarker() throws IOException, IllegalDataException {
         List<Layer> layers = testRead("gpx_markers.joz");
-        assertTrue(layers.size() == 2);
+        assertSame(layers.size(), 2);
         GpxLayer gpx = null;
         MarkerLayer marker = null;
@@ -105 +107 @@
             }
         }
-        assertTrue(gpx != null);
-        assertTrue(marker != null);
+        assertNotNull(gpx);
+        assertNotNull(marker);
         assertEquals(gpx.getName(), "GPX layer name");
         assertEquals(marker.getName(), "Marker layer name");