Changeset 10202 in josm for trunk

Timestamp:

2016-05-13T04:20:36+02:00 (9 years ago)

Author:

Don-vip

Message:

increase code coverage

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java

@@ -73 +73 @@
     private static final EmailValidator EMAIL_VALIDATOR_WITH_LOCAL = new EmailValidator(true, false);
 
-
-    /**
-     * Singleton instance of this class, which does
-     *  consider local addresses valid.
-     */
-    private static final EmailValidator EMAIL_VALIDATOR_WITH_LOCAL_WITH_TLD = new EmailValidator(true, true);
-
     /**
      * Returns the Singleton instance of this validator.
@@ -99 +92 @@
     public static EmailValidator getInstance(boolean allowLocal, boolean allowTld) {
         if (allowLocal) {
-            if (allowTld) {
-                return EMAIL_VALIDATOR_WITH_LOCAL_WITH_TLD;
-            } else {
-                return EMAIL_VALIDATOR_WITH_LOCAL;
-            }
+            return EMAIL_VALIDATOR_WITH_LOCAL;
         } else {
             if (allowTld) {

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -409 +410 @@
         assertTrue(r2.getMembers().contains(new RelationMember("relation-1", r1)));
     }
+
+    /**
+     * Unit test of {@code AbstractVisitor#visit(org.openstreetmap.josm.data.osm.Changeset)}.
+     */
+    @Test
+    public void testVisitChangeset() {
+        new MergeSourceBuildingVisitor(new DataSet()).visit(new Changeset());
+    }
 }

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

@@ -60 +60 @@
     public void testEmail()  {
         assertTrue(validator.isValid("jsmith@apache.org"));
+        assertFalse(validator.isValid(null));
     }