OptionalValidator no longer fails valid settings

Change-Id: I84d88575fd48f11ef1236fcbe1d137ac5bbbc920
Reviewed-on: http://gerrit.dmdirc.com/1568
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -54,16 +54,16 @@ public class OptionalValidator implements Validator<String> {
         final int colonIndex = object.indexOf(':');
 
         if (colonIndex == -1) {
-            return new ValidationResponse("Must contain boolean int seperator.");
+            return validator.validate(object);
         }
 
         final String booleanv = object.substring(0, colonIndex);
 
-        if (!"true".equals(booleanv) && !"false".equals(booleanv)) {
-            return new ValidationResponse("Must be true or false.");
+        if ("true".equals(booleanv) || "false".equals(booleanv)) {
+            return validator.validate(object.substring(colonIndex + 1));
         }
 
-        return validator.validate(object.substring(colonIndex + 1));
+        return validator.validate(object);
     }
 
 }

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

@@ -32,17 +32,16 @@ public class OptionalValidatorTest {
 
     @Test
     public void testNoSeparator() {
-        final ValidationResponse res = new OptionalValidator(null).validate("foo");
-        assertTrue(res.isFailure());
-        assertTrue(res.getFailureReason().contains("boolean"));
+        final ValidationResponse res = new OptionalValidator(new StringLengthValidator(0, 3))
+                .validate("foo");
+        assertFalse(res.isFailure());
     }
 
     @Test
     public void testIllegalPrefix() {
-        final ValidationResponse res = new OptionalValidator(null).validate("foo:bar");
-        assertTrue(res.isFailure());
-        assertTrue(res.getFailureReason().contains("true"));
-        assertTrue(res.getFailureReason().contains("false"));
+        final ValidationResponse res = new OptionalValidator(new StringLengthValidator(6, 7))
+                .validate("foo:bar");
+        assertFalse(res.isFailure());
     }
 
     @Test