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

Timestamp:

2016-08-06T01:12:07+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - pmd-unit-tests:UseAssertTrueInsteadOfAssertEquals

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/validation/tests/TagCheckerTest.java (modified) (4 diffs)
• gui/correction/RoleCorrectionTableTest.java (modified) (1 diff)
• gui/correction/TagCorrectionTableTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -50 +51 @@
         assertEquals("Misspelled property key", errors.get(0).getMessage());
         assertEquals("Key 'Name' looks like 'name'.", errors.get(0).getDescription());
-        assertEquals(true, errors.get(0).isFixable());
+        assertTrue(errors.get(0).isFixable());
     }
 
@@ -63 +64 @@
         assertEquals("Misspelled property key", errors.get(0).getMessage());
         assertEquals("Key 'landuse;' looks like 'landuse'.", errors.get(0).getDescription());
-        assertEquals(true, errors.get(0).isFixable());
+        assertTrue(errors.get(0).isFixable());
     }
 
@@ -77 +78 @@
         assertEquals("Misspelled property key", errors.get(0).getMessage());
         assertEquals("Key 'Brand' looks like 'brand'.", errors.get(0).getDescription());
-        assertEquals(false, errors.get(0).isFixable());
+        assertFalse(errors.get(0).isFixable());
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java

@@ -62 +62 @@
         assertEquals("foo", model.getValueAt(0, 1));
         assertEquals("bar", model.getValueAt(0, 2));
-        assertEquals(Boolean.TRUE, model.getValueAt(0, 3));
+        assertTrue((Boolean) model.getValueAt(0, 3));
         assertNull(model.getValueAt(0, 4));
         model.setValueAt("", 0, 0);
         assertEquals("relation (0, 1 member)", model.getValueAt(0, 0));
         model.setValueAt("", 0, 3);
-        assertEquals(Boolean.TRUE, model.getValueAt(0, 3));
+        assertTrue((Boolean) model.getValueAt(0, 3));
         model.setValueAt(Boolean.FALSE, 0, 3);
-        assertEquals(Boolean.FALSE, model.getValueAt(0, 3));
+        assertFalse((Boolean) model.getValueAt(0, 3));
         RoleCorrection[] array = new RoleCorrection[15];
         Arrays.fill(array, rc);

trunk/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java

@@ -67 +67 @@
         assertEquals("foo", model.getValueAt(0, 2));
         assertEquals("baz", model.getValueAt(0, 3));
-        assertEquals(Boolean.TRUE, model.getValueAt(0, 4));
+        assertTrue((Boolean) model.getValueAt(0, 4));
         assertNull(model.getValueAt(0, 5));
         assertEquals("bar", model.getValueAt(1, 0));
@@ -73 +73 @@
         assertEquals("baz", model.getValueAt(1, 2));
         assertEquals("foo", model.getValueAt(1, 3));
-        assertEquals(Boolean.TRUE, model.getValueAt(1, 4));
+        assertTrue((Boolean) model.getValueAt(1, 4));
         assertNull(model.getValueAt(1, 5));
         model.setValueAt("", 0, 0);
         assertEquals("foo", model.getValueAt(0, 0));
         model.setValueAt("", 0, 4);
-        assertEquals(Boolean.TRUE, model.getValueAt(0, 4));
+        assertTrue((Boolean) model.getValueAt(0, 4));
         model.setValueAt(Boolean.FALSE, 0, 4);
-        assertEquals(Boolean.FALSE, model.getValueAt(0, 4));
+        assertFalse((Boolean) model.getValueAt(0, 4));
         TagCorrection[] array = new TagCorrection[15];
         Arrays.fill(array, tc1);