Tidy up unit tests

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

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

@@ -19,37 +19,26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.util.validators;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
 /**
  * Validates a server name, prepending an irc protocol if no protocol is
  * specified.
  */
-public class ServerNameValidator implements Validator<String> {
+public class ServerNameValidator extends URIValidator {
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public ValidationResponse validate(final String object) {
-        try {
-            if (object == null || object.isEmpty()) {
-                return new ValidationResponse("Server name is required.");
-            }
-            if (!object.matches(".*://")) {
-                new URI("irc://" + object);
-            } else {
-                new URI(object);
-            }
-            return new ValidationResponse();
-        } catch (URISyntaxException ex) {
-            if ("Expected authority".equals(ex.getReason())) {
-                return new ValidationResponse("Address requires a hostname.");
-            } else {
-                return new ValidationResponse(ex.getReason());
-            }
+        if (object == null || object.isEmpty()) {
+            return new ValidationResponse("Server name is required.");
+        }
+        if (!object.matches(".*://")) {
+            return super.validate("irc://" + object);
+        } else {
+            return super.validate(object);
         }
     }
 }

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

@@ -33,17 +33,15 @@ public class URIValidator implements Validator<String> {
     /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {
-        ValidationResponse result;
         try {
-            final URI uri = new URI(object);
-            if (uri.getHost() == null || uri.getHost().isEmpty()) {
-                result = new ValidationResponse("Address requires a hostname.");
+            new URI(object);
+        } catch (URISyntaxException ex) {
+            if ("Expected authority".equals(ex.getReason())) {
+                return new ValidationResponse("Address requires a hostname.");
             } else {
-                result = new ValidationResponse();
+                return new ValidationResponse(ex.getReason());
             }
-        } catch (URISyntaxException ex) {
-            result = new ValidationResponse(ex.getReason());
         }
-        return result;
+        return new ValidationResponse();
     }
 }

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

@@ -30,8 +30,9 @@ public class URIValidatorTest {
 
     @Test
     public void testValidateNoHostname() {
-        URIValidator instance = new URIValidator();
-        assertTrue(instance.validate("http://").isFailure());
+        ServerNameValidator instance = new ServerNameValidator();
+        assertEquals("Address requires a hostname.",
+                instance.validate("irc://").getFailureReason());
     }
 
     @Test