Improve server name validation. Unit test things.

Change-Id: Ic8df21726d438117222c09f617ea9b66dfc7df88
Reviewed-on: http://gerrit.dmdirc.com/2437
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/util/validators/ServerNameValidator.java

@@ -35,17 +35,21 @@ public class ServerNameValidator implements Validator<String> {
     @Override
     public ValidationResponse validate(final String object) {
         try {
-            URI uri = new URI(object);
-            if (uri.getHost() == null || uri.getHost().isEmpty()) {
-                uri = new URI("irc://" + object);
+            if (object == null || object.isEmpty()) {
+                return new ValidationResponse("Server name is required.");
             }
-            if (uri.getHost() == null || uri.getHost().isEmpty()) {
-                return new ValidationResponse("Address requires a hostname.");
+            if (!object.matches(".*://")) {
+                new URI("irc://" + object);
             } else {
-                return new ValidationResponse();
+                new URI(object);
             }
+            return new ValidationResponse();
         } catch (URISyntaxException ex) {
-            return new ValidationResponse(ex.getReason());
+            if ("Expected authority".equals(ex.getReason())) {
+                return new ValidationResponse("Address requires a hostname.");
+            } else {
+                return new ValidationResponse(ex.getReason());
+            }
         }
     }
 }

test/com/dmdirc/util/validators/DisabledOptionValidatorTest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2012 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.dmdirc.util.validators;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class DisabledOptionValidatorTest {
+
+    @Test
+    public void testValidateNull() {
+        DisabledOptionValidator instance = new DisabledOptionValidator();
+        assertFalse(instance.validate(null).isFailure());
+    }
+
+    @Test
+    public void testValidateFalse() {
+        DisabledOptionValidator instance = new DisabledOptionValidator();
+        assertTrue(instance.validate("false:moo").isFailure());
+    }
+
+    @Test
+    public void testValidateTrue() {
+        DisabledOptionValidator instance = new DisabledOptionValidator();
+        assertFalse(instance.validate("true:moo").isFailure());
+    }
+}

test/com/dmdirc/util/validators/NumericalValidatorTest.java

@@ -21,13 +21,17 @@
  */
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.NumericalValidator;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class NumericalValidatorTest {
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorThrowsExceptionForInvalidArguments() {
+        new NumericalValidator(2, 1);
+    }
+
     @Test
     public void testGetMax() {
         assertEquals(10, new NumericalValidator(1, 10).getMax());
@@ -43,34 +47,34 @@ public class NumericalValidatorTest {
     @Test
     public void testNAN() {
         final ValidationResponse vr = new NumericalValidator(3, 5).validate("foo");
-        
+
         assertTrue(vr.isFailure());
         assertTrue(vr.getFailureReason().indexOf("number") > -1);
     }
-    
+
     @Test
     public void testMin() {
         final NumericalValidator nv1 = new NumericalValidator(-1, -1);
         final NumericalValidator nv2 = new NumericalValidator(-5, -1);
-        
+
         assertFalse(nv1.validate("-5").isFailure());
         assertFalse(nv2.validate("-5").isFailure());
         assertFalse(nv2.validate("-4").isFailure());
         assertFalse(nv2.validate("10").isFailure());
         assertTrue(nv2.validate("-6").isFailure());
     }
-    
+
     @Test
     public void testMax() {
         final NumericalValidator nv1 = new NumericalValidator(-1, -1);
         final NumericalValidator nv2 = new NumericalValidator(-1, 10);
-        
+
         assertFalse(nv1.validate("-5").isFailure());
         assertFalse(nv1.validate("50").isFailure());
         assertFalse(nv2.validate("-5").isFailure());
         assertFalse(nv2.validate("-4").isFailure());
         assertFalse(nv2.validate("10").isFailure());
         assertTrue(nv2.validate("11").isFailure());
-    }    
+    }
 
 }

test/com/dmdirc/util/validators/OptionalValidatorTest.java

@@ -22,14 +22,19 @@
 
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.OptionalValidator;
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.StringLengthValidator;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class OptionalValidatorTest {
 
+    @Test
+    public void testGetValidator() {
+        final Validator<String> validator = new PermissiveValidator<String>();
+        final OptionalValidator instance = new OptionalValidator(validator);
+        assertEquals(validator, instance.getValidator());
+    }
+
     @Test
     public void testNoSeparator() {
         final ValidationResponse res = new OptionalValidator(new StringLengthValidator(0, 3))

test/com/dmdirc/util/validators/ServerNameValidatorTest.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2006-2012 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.dmdirc.util.validators;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ServerNameValidatorTest {
+
+
+    @Test
+    public void testValidateNull() {
+        ServerNameValidator instance = new ServerNameValidator();
+        assertTrue(instance.validate(null).isFailure());
+    }
+
+    @Test
+    public void testValidateEmpty() {
+        ServerNameValidator instance = new ServerNameValidator();
+        assertTrue(instance.validate("").isFailure());
+    }
+
+    @Test
+    public void testValidateNoProtocol() {
+        ServerNameValidator instance = new ServerNameValidator();
+        assertFalse(instance.validate("test.com").isFailure());
+    }
+
+    @Test
+    public void testValidateNoHostname() {
+        ServerNameValidator instance = new ServerNameValidator();
+        assertEquals("Address requires a hostname.",
+                instance.validate("irc://").getFailureReason());
+    }
+
+    @Test
+    public void testValidateInvalidURI() {
+        ServerNameValidator instance = new ServerNameValidator();
+        assertTrue(instance.validate("irc://^").isFailure());
+    }
+
+    @Test
+    public void testValidateValid() {
+        ServerNameValidator instance = new ServerNameValidator();
+        assertFalse(instance.validate("irc://test.com").isFailure());
+    }
+}

test/com/dmdirc/util/validators/URIValidatorTest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2012 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.dmdirc.util.validators;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class URIValidatorTest {
+
+    @Test
+    public void testValidateNoHostname() {
+        URIValidator instance = new URIValidator();
+        assertTrue(instance.validate("http://").isFailure());
+    }
+
+    @Test
+    public void testValidateInvalidURI() {
+        URIValidator instance = new URIValidator();
+        assertTrue(instance.validate("http://^").isFailure());
+    }
+
+    @Test
+    public void testValidateValid() {
+        URIValidator instance = new URIValidator();
+        assertFalse(instance.validate("http://google.com:80").isFailure());
+    }
+}