Add some validator unit tests.

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

@@ -31,11 +31,6 @@ import java.util.List;
  */
 public class ListNotEmptyValidator<T> implements Validator<List<T>> {
 
-    /**
-     * Serialisation version.
-     */
-    private static final long serialVersionUID = 1;
-
     @Override
     public ValidationResponse validate(final List<T> object) {
         if (object == null || object.isEmpty()) {

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2006-2015 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 java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class ColourValidatorTest {
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                        {"-1", false},
+                        {"0", true},
+                        {"1", true},
+                        {"2", true},
+                        {"2", true},
+                        {"3", true},
+                        {"4", true},
+                        {"5", true},
+                        {"6", true},
+                        {"7", true},
+                        {"8", true},
+                        {"9", true},
+                        {"10", true},
+                        {"11", true},
+                        {"12", true},
+                        {"13", true},
+                        {"14", true},
+                        {"15", true},
+                        {"16", false},
+                        {"000000", true},
+                        {"ffffff", true},
+                        {"0000000", false},
+                        {"gggggg", false},
+                }
+        );
+    }
+
+    private final String input;
+
+    private final boolean expected;
+
+    public ColourValidatorTest(final String input, final boolean expected) {
+        this.input = input;
+        this.expected = expected;
+    }
+
+    @Test
+    public void test() {
+        final Validator<String> instance = new ColourValidator();
+        assertEquals(expected, !instance.validate(input).isFailure());
+    }
+}

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2006-2015 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 org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class IntegerPortValidatorTest {
+
+    @Test
+    public void testValidate_TooLow() throws Exception {
+        assertTrue(new IntegerPortValidator().validate(0).isFailure());
+    }
+
+    @Test
+    public void testValidate_Min() throws Exception {
+        assertFalse(new IntegerPortValidator().validate(1).isFailure());
+    }
+
+    @Test
+    public void testValidate_Normal() throws Exception {
+        assertFalse(new IntegerPortValidator().validate(5).isFailure());
+    }
+
+    @Test
+    public void testValidate_Max() throws Exception {
+        assertFalse(new IntegerPortValidator().validate(65535).isFailure());
+    }
+
+    @Test
+    public void testValidate_TooHigh() throws Exception {
+        assertTrue(new IntegerPortValidator().validate(65536).isFailure());
+    }
+
+}

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

@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2006-2015 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.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class IntegerValidatorTest {
+
+    private IntegerValidator instance;
+
+    @Before
+    public void setUp() throws Exception {
+        instance = new IntegerValidator(5, 10);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidConstruction() throws Exception {
+        instance = new IntegerValidator(10, 5);
+    }
+
+    @Test
+    public void testPlaceholderMinimum() throws Exception {
+        instance = new IntegerValidator(-1, 10);
+        assertEquals(Integer.MIN_VALUE, instance.getMin());
+    }
+
+    @Test
+    public void testPlaceholderMaximum() throws Exception {
+        instance = new IntegerValidator(5, -1);
+        assertEquals(Integer.MAX_VALUE, instance.getMax());
+    }
+
+    @Test
+    public void testGetMax() throws Exception {
+        assertEquals(5, instance.getMin());
+    }
+
+    @Test
+    public void testGetMin() throws Exception {
+        assertEquals(10, instance.getMax());
+
+    }
+
+    @Test
+    public void testValidate_Less_Reason() throws Exception {
+        assertEquals("Must be at least 5", instance.validate(4).getFailureReason());
+    }
+
+    @Test
+    public void testValidate_LessThanMin() throws Exception {
+        assertTrue(instance.validate(4).isFailure());
+    }
+
+    @Test
+    public void testValidate_Min() throws Exception {
+        assertFalse(instance.validate(5).isFailure());
+    }
+
+    @Test
+    public void testValidate_Max() throws Exception {
+        assertFalse(instance.validate(10).isFailure());
+    }
+
+    @Test
+    public void testValidate_MoreThanMax() throws Exception {
+        assertTrue(instance.validate(11).isFailure());
+    }
+
+    @Test
+    public void testValidate_Max_Reason() throws Exception {
+        assertEquals("Must be at most 10", instance.validate(11).getFailureReason());
+    }
+
+    @Test
+    public void testValidate_Normal() throws Exception {
+        assertFalse(instance.validate(6).isFailure());
+    }
+}

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2006-2015 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 java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ListNotEmptyValidatorTest {
+
+    @Test
+    public void testValidate_Null() throws Exception {
+        assertTrue(new ListNotEmptyValidator<String>().validate(null).isFailure());
+    }
+
+    @Test
+    public void testValidate_Empty() throws Exception {
+        assertTrue(new ListNotEmptyValidator<String>().validate(new ArrayList<>()).isFailure());
+    }
+
+    @Test
+     public void testValidate_NotEmpty() throws Exception {
+        final List<String> list = new ArrayList<>();
+        list.add("RAR");
+        assertFalse(new ListNotEmptyValidator<String>().validate(list).isFailure());
+    }
+}

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

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2006-2015 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 org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class OptionalEmailAddressValidatorTest {
+
+    @Test
+    public void testValidate_Null() throws Exception {
+        assertFalse(new OptionalEmailAddressValidator().validate(null).isFailure());
+    }
+
+    @Test
+    public void testValidate_Empty() throws Exception {
+        assertFalse(new OptionalEmailAddressValidator().validate("").isFailure());
+    }
+
+    @Test
+    public void testValidate_Valid() throws Exception {
+        assertFalse(new OptionalEmailAddressValidator().validate("test@test.com").isFailure());
+    }
+
+    @Test
+    public void testValidate_Invalid() throws Exception {
+        assertTrue(new OptionalEmailAddressValidator().validate("email@example@example.com")
+                .isFailure());
+    }
+}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2015 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 org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ValidationResponseTest {
+
+    @Test
+    public void testIsFailure_Reason() throws Exception {
+        assertTrue(new ValidationResponse("Reason").isFailure());
+    }
+
+    @Test
+    public void testIsFailure_EmptyReason() throws Exception {
+        assertTrue(new ValidationResponse("").isFailure());
+    }
+
+    @Test
+    public void testIsFailure_NoArgs() throws Exception {
+        assertFalse(new ValidationResponse().isFailure());
+    }
+
+    @Test
+    public void testIsFailure_Null() throws Exception {
+        assertFalse(new ValidationResponse(null).isFailure());
+    }
+
+    @Test
+    public void testGetFailureReason_Null() throws Exception {
+        assertEquals(null, new ValidationResponse().getFailureReason());
+    }
+
+    @Test
+    public void testGetFailureReason_Empty() throws Exception {
+        assertEquals("", new ValidationResponse("").getFailureReason());
+    }
+
+    @Test
+    public void testGetFailureReason_Args() throws Exception {
+        assertEquals("RAR", new ValidationResponse("RAR").getFailureReason());
+    }
+}