Changeset 15950 in josm for trunk/test

Timestamp:

2020-02-28T00:24:17+01:00 (6 years ago)

Author:

simon04

Message:

Simplify OsmUtils.isTrue/isFalse/isReversed

Just use a plain switch statement instead of a HashMap

File:

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

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -14 +16 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+/**
+ * Unit tests for class {@link OsmUtils}.
+ */
 public class OsmUtilsTest {
 
@@ -23 +28 @@
     public JOSMTestRules test = new JOSMTestRules();
 
+    /**
+     * Unit test of {@link OsmUtils#createPrimitive}
+     */
     @Test
-    public void testCreatePrimitive() throws Exception {
+    public void testCreatePrimitive() {
         final OsmPrimitive p = OsmUtils.createPrimitive("way name=Foo railway=rail");
         assertTrue(p instanceof Way);
@@ -32 +40 @@
     }
 
+    /**
+     * Unit test of {@link OsmUtils#createPrimitive}
+     */
     @Test
-    public void testArea() throws Exception {
+    public void testArea() {
         final OsmPrimitive p = OsmUtils.createPrimitive("area name=Foo railway=rail");
         assertEquals(OsmPrimitiveType.WAY, p.getType());
-        assertTrue(p.getKeys().equals(OsmUtils.createPrimitive("way name=Foo railway=rail").getKeys()));
+        assertEquals(p.getKeys(), OsmUtils.createPrimitive("way name=Foo railway=rail").getKeys());
     }
 
+    /**
+     * Unit test of {@link OsmUtils#createPrimitive}
+     */
     @Test(expected = IllegalArgumentException.class)
-    public void testCreatePrimitiveFail() throws Exception {
+    public void testCreatePrimitiveFail() {
         OsmUtils.createPrimitive("noway name=Foo");
     }
 
+    /**
+     * Unit test of {@link OsmUtils#splitMultipleValues}
+     */
     @Test
     public void testSplitMultipleValues() {
@@ -52 +69 @@
                 OsmUtils.splitMultipleValues("Tu-Fr 08:00-18:00;Mo 09:00-18:00;Sa 09:00-12:00;closed Aug").collect(Collectors.toList()));
     }
+
+    /**
+     * Unit test of {@link OsmUtils#isTrue}, {@link OsmUtils#isFalse}, {@link OsmUtils#getOsmBoolean}
+     */
+    @Test
+    public void testTrueFalse() {
+        assertTrue(OsmUtils.isTrue("yes"));
+        assertFalse(OsmUtils.isFalse("yes"));
+        assertEquals(Boolean.TRUE, OsmUtils.getOsmBoolean("yes"));
+        assertTrue(OsmUtils.isFalse("no"));
+        assertFalse(OsmUtils.isTrue("no"));
+        assertEquals(Boolean.FALSE, OsmUtils.getOsmBoolean("no"));
+        assertNull(OsmUtils.getOsmBoolean("foobar"));
+    }
 }