Changeset 9967 in josm

Timestamp:

2016-03-12T11:35:43+01:00 (8 years ago)

Author:

Don-vip

Message:

cleanup unit tests

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/routines

Files:

• DomainValidatorTest.java (modified) (2 diffs)
• RegexValidatorTest.java (modified) (7 diffs)
• UrlValidatorTest.java (modified) (1 diff)

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

@@ -25 +25 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.net.IDN;
 import java.util.Locale;
 
@@ -282 +281 @@
             assertEquals(s[1], DomainValidator.unicodeToASCII(s[0]));
         }
-    }
-
-    /**
-     * Check if IDN.toASCII is broken or not
-     */
-    @Test
-    public void testIsIDNtoASCIIBroken() {
-        System.out.println(">>DomainValidatorTest.testIsIDNtoASCIIBroken()");
-        final String input = ".";
-        final boolean ok = input.equals(IDN.toASCII(input));
-        System.out.println("IDN.toASCII is " + (ok ? "OK" : "BROKEN"));
-        String[] props = {
-        "java.version", //    Java Runtime Environment version
-        "java.vendor", // Java Runtime Environment vendor
-        "java.vm.specification.version", //   Java Virtual Machine specification version
-        "java.vm.specification.vendor", //    Java Virtual Machine specification vendor
-        "java.vm.specification.name", //  Java Virtual Machine specification name
-        "java.vm.version", // Java Virtual Machine implementation version
-        "java.vm.vendor", //  Java Virtual Machine implementation vendor
-        "java.vm.name", //    Java Virtual Machine implementation name
-        "java.specification.version", //  Java Runtime Environment specification version
-        "java.specification.vendor", //   Java Runtime Environment specification vendor
-        "java.specification.name", // Java Runtime Environment specification name
-        "java.class.version", //  Java class format version number
-        };
-        for (String t : props) {
-            System.out.println(t + "=" + System.getProperty(t));
-        }
-        System.out.println("<<DomainValidatorTest.testIsIDNtoASCIIBroken()");
     }
 

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

@@ -18 +18 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -56 +58 @@
 
         // isValid()
-        assertEquals("Sensitive isValid() valid",     true,   sensitive.isValid("ac-DE-1"));
-        assertEquals("Sensitive isValid() invalid",   false,  sensitive.isValid("AB-de-1"));
-        assertEquals("Insensitive isValid() valid",   true,   insensitive.isValid("AB-de-1"));
-        assertEquals("Insensitive isValid() invalid", false,  insensitive.isValid("ABd-de-1"));
+        assertTrue("Sensitive isValid() valid",      sensitive.isValid("ac-DE-1"));
+        assertFalse("Sensitive isValid() invalid",   sensitive.isValid("AB-de-1"));
+        assertTrue("Insensitive isValid() valid",    insensitive.isValid("AB-de-1"));
+        assertFalse("Insensitive isValid() invalid", insensitive.isValid("ABd-de-1"));
 
         // validate()
-        assertEquals("Sensitive validate() valid",     "acDE1", sensitive.validate("ac-DE-1"));
-        assertEquals("Sensitive validate() invalid",   null,    sensitive.validate("AB-de-1"));
-        assertEquals("Insensitive validate() valid",   "ABde1", insensitive.validate("AB-de-1"));
-        assertEquals("Insensitive validate() invalid", null,    insensitive.validate("ABd-de-1"));
+        assertEquals("Sensitive validate() valid",   "acDE1", sensitive.validate("ac-DE-1"));
+        assertNull("Sensitive validate() invalid",   sensitive.validate("AB-de-1"));
+        assertEquals("Insensitive validate() valid", "ABde1", insensitive.validate("AB-de-1"));
+        assertNull("Insensitive validate() invalid", insensitive.validate("ABd-de-1"));
 
         // match()
@@ -94 +96 @@
 
         // isValid()
-        assertEquals("Sensitive isValid() Multiple", true,  multiple.isValid(value));
-        assertEquals("Sensitive isValid() 1st",      false, single1.isValid(value));
-        assertEquals("Sensitive isValid() 2nd",      true,  single2.isValid(value));
-        assertEquals("Sensitive isValid() 3rd",      false, single3.isValid(value));
+        assertTrue("Sensitive isValid() Multiple", multiple.isValid(value));
+        assertFalse("Sensitive isValid() 1st",     single1.isValid(value));
+        assertTrue("Sensitive isValid() 2nd",      single2.isValid(value));
+        assertFalse("Sensitive isValid() 3rd",     single3.isValid(value));
 
         // validate()
         assertEquals("Sensitive validate() Multiple", expect, multiple.validate(value));
-        assertNull("Sensitive validate() 1st",      single1.validate(value));
+        assertNull("Sensitive validate() 1st",        single1.validate(value));
         assertEquals("Sensitive validate() 2nd",      expect, single2.validate(value));
-        assertNull("Sensitive validate() 3rd",      single3.validate(value));
+        assertNull("Sensitive validate() 3rd",        single3.validate(value));
 
         // match()
@@ -113 +115 @@
         // All invalid
         value = "AAC*FDE*321";
-        assertEquals("isValid() Invalid",  false, multiple.isValid(value));
+        assertFalse("isValid() Invalid", multiple.isValid(value));
         assertNull("validate() Invalid", multiple.validate(value));
         assertNull("match() Multiple",   multiple.match(value));
@@ -136 +138 @@
 
         // isValid()
-        assertEquals("isValid() Multiple", true,  multiple.isValid(value));
-        assertEquals("isValid() 1st",      false, single1.isValid(value));
-        assertEquals("isValid() 2nd",      true,  single2.isValid(value));
-        assertEquals("isValid() 3rd",      false, single3.isValid(value));
+        assertTrue("isValid() Multiple", multiple.isValid(value));
+        assertFalse("isValid() 1st",     single1.isValid(value));
+        assertTrue("isValid() 2nd",      single2.isValid(value));
+        assertFalse("isValid() 3rd",     single3.isValid(value));
 
         // validate()
         assertEquals("validate() Multiple", expect, multiple.validate(value));
-        assertNull("validate() 1st",      single1.validate(value));
+        assertNull("validate() 1st",        single1.validate(value));
         assertEquals("validate() 2nd",      expect, single2.validate(value));
-        assertNull("validate() 3rd",      single3.validate(value));
+        assertNull("validate() 3rd",        single3.validate(value));
 
         // match()
@@ -155 +157 @@
         // All invalid
         value = "AAC*FDE*321";
-        assertEquals("isValid() Invalid",  false, multiple.isValid(value));
+        assertFalse("isValid() Invalid", multiple.isValid(value));
         assertNull("validate() Invalid", multiple.validate(value));
         assertNull("match() Multiple",   multiple.match(value));
@@ -165 +167 @@
     @Test
     public void testNullValue() {
-
         RegexValidator validator = new RegexValidator(REGEX);
-        assertEquals("Instance isValid()",  false, validator.isValid(null));
+        assertFalse("Instance isValid()", validator.isValid(null));
         assertNull("Instance validate()", validator.validate(null));
         assertNull("Instance match()",    validator.match(null));

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

@@ -399 +399 @@
        }
        return carryMsg.toString();
-   }
-
-   /**
-    * Test validate URL
-    */
-   @Test
-   public void testValidateUrl() {
-      assertTrue(true);
    }