Changeset 10133 in josm

Timestamp:

2016-04-10T13:37:15+02:00 (8 years ago)

Author:

Don-vip

Message:

increase code coverage

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -30 +30 @@
 public final class DateUtils {
 
-    private DateUtils() {
+    protected DateUtils() {
         // Hide default constructor for utils classes
     }
@@ -170 +170 @@
 
     private static boolean checkLayout(String text, String pattern) {
-        if (text.length() != pattern.length()) return false;
+        if (text.length() != pattern.length())
+            return false;
         for (int i = 0; i < pattern.length(); i++) {
             char pc = pattern.charAt(i);
             char tc = text.charAt(i);
-            if (pc == 'x' && tc >= '0' && tc <= '9') continue;
-            else if (pc == 'x' || pc != tc) return false;
+            if (pc == 'x' && Character.isDigit(tc))
+                continue;
+            else if (pc == 'x' || pc != tc)
+                return false;
         }
         return true;

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java

@@ -20 +20 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -478 +479 @@
         return sorted && strictlySorted && lowerCase;
     }
+
+    /**
+     * Unit test of {@link DomainValidator#getValidatorName}.
+     */
+    @Test
+    public void testValidatorName() {
+        assertNull(DomainValidator.getInstance().getValidatorName());
+    }
 }

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java

@@ -574 +574 @@
         assertTrue(validator.isValid("abc@school.school"));
     }
+
+    /**
+     * Unit test of {@link EmailValidator#getValidatorName}.
+     */
+    @Test
+    public void testValidatorName() {
+        assertEquals("Email validator", EmailValidator.getInstance().getValidatorName());
+    }
 }

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java

@@ -19 +19 @@
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -615 +616 @@
     // CHECKSTYLE.ON: MethodLengthCheck
     // CHECKSTYLE.ON: LineLength
+
+    /**
+     * Unit test of {@link InetAddressValidator#getValidatorName}.
+     */
+    @Test
+    public void testValidatorName() {
+        assertNull(new InetAddressValidator().getValidatorName());
+    }
 }

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java

@@ -257 +257 @@
 
     /**
+     * Unit test of {@link RegexValidator#getValidatorName}.
+     */
+    @Test
+    public void testValidatorName() {
+        assertNull(new RegexValidator(".*").getValidatorName());
+    }
+
+    /**
      * Compare two arrays
      * @param label Label for the test

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java

@@ -546 +546 @@
    }
 
+   /**
+    * Unit test of {@link UrlValidator#getValidatorName}.
+    */
+   @Test
+   public void testValidatorName() {
+       assertEquals("URL validator", UrlValidator.getInstance().getValidatorName());
+   }
+
    //-------------------- Test data for creating a composite URL
    /**

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

@@ -39 +39 @@
         RelationMember member = new RelationMember("foo", new Node());
         r.addMember(member);
-        RoleCorrectionTable t = new RoleCorrectionTable(Arrays.asList(new RoleCorrection(r, 0, member, "bar")));
+        RoleCorrection rc = new RoleCorrection(r, 0, member, "bar");
+        RoleCorrectionTable t = new RoleCorrectionTable(Arrays.asList(rc));
         assertNotNull(t.getCellRenderer(0, 0));
         assertNotNull(t.getCellRenderer(0, 1));
@@ -63 +64 @@
         assertEquals(Boolean.TRUE, 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));
+        model.setValueAt(Boolean.FALSE, 0, 3);
+        assertEquals(Boolean.FALSE, model.getValueAt(0, 3));
+        RoleCorrection[] array = new RoleCorrection[15];
+        Arrays.fill(array, rc);
+        t = new RoleCorrectionTable(Arrays.asList(array));
+        assertEquals(array.length, t.getCorrectionTableModel().getCorrections().size());
     }
 }

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

@@ -33 +33 @@
     @Test
     public void testTagCorrectionTable() {
-        TagCorrectionTable t = new TagCorrectionTable(Arrays.asList(new TagCorrection("foo", "bar", "foo", "baz")));
+        TagCorrection tc1 = new TagCorrection("foo", "bar", "foo", "baz");
+        TagCorrection tc2 = new TagCorrection("bar", "foo", "baz", "foo");
+        TagCorrectionTable t = new TagCorrectionTable(Arrays.asList(tc1, tc2));
         assertNotNull(t.getCellRenderer(0, 0));
         assertNotNull(t.getCellRenderer(0, 1));
         assertNotNull(t.getCellRenderer(0, 2));
         assertNotNull(t.getCellRenderer(0, 3));
+        assertNotNull(t.getCellRenderer(0, 4));
+        assertNotNull(t.getCellRenderer(1, 0));
+        assertNotNull(t.getCellRenderer(1, 1));
+        assertNotNull(t.getCellRenderer(1, 2));
+        assertNotNull(t.getCellRenderer(1, 3));
+        assertNotNull(t.getCellRenderer(1, 4));
         TagCorrectionTableModel model = t.getCorrectionTableModel();
-        assertEquals(1, model.getCorrections().size());
-        assertEquals(1, model.getRowCount());
+        assertEquals(2, model.getCorrections().size());
+        assertEquals(2, model.getRowCount());
         assertEquals(4, model.getApplyColumn());
         assertTrue(model.getApply(0));
@@ -52 +60 @@
         assertNull(model.getColumnName(5));
         assertFalse(model.isCellEditable(0, 0));
+        assertFalse(model.isCellEditable(1, 0));
         assertTrue(model.isCellEditable(0, 4));
+        assertTrue(model.isCellEditable(1, 4));
         assertEquals("foo", model.getValueAt(0, 0));
         assertEquals("bar", model.getValueAt(0, 1));
@@ -59 +69 @@
         assertEquals(Boolean.TRUE, model.getValueAt(0, 4));
         assertNull(model.getValueAt(0, 5));
+        assertEquals("bar", model.getValueAt(1, 0));
+        assertEquals("foo", model.getValueAt(1, 1));
+        assertEquals("baz", model.getValueAt(1, 2));
+        assertEquals("foo", model.getValueAt(1, 3));
+        assertEquals(Boolean.TRUE, 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));
+        model.setValueAt(Boolean.FALSE, 0, 4);
+        assertEquals(Boolean.FALSE, model.getValueAt(0, 4));
+        TagCorrection[] array = new TagCorrection[15];
+        Arrays.fill(array, tc1);
+        t = new TagCorrectionTable(Arrays.asList(array));
+        assertEquals(array.length, t.getCorrectionTableModel().getCorrections().size());
     }
 }

trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java

@@ -187 +187 @@
         }
     }
+
+    /**
+     * Unit test to reach 100% code coverage.
+     */
+    @Test
+    public void testCoverage() {
+        assertNotNull(new DateUtils());
+    }
 }