git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@278640 13f79535-47bb-0310-9956-ffa450edef68

Author: John Keyes

src/java/org/apache/commons/cli2/validation/EnumValidator.java

@@ -51,7 +51,7 @@ public class EnumValidator implements Validator {
      * @param values The list of permitted values
      */
     public EnumValidator(final Set values) {
-        this.validValues = values;
+        setValidValues(values);
     }
 
     /**
@@ -113,7 +113,7 @@ public Set getValidValues() {
      *
      * @param validValues The Set of valid argument values.
      */
-    public void setValidValues(Set validValues) {
+    protected void setValidValues(Set validValues) {
         this.validValues = validValues;
     }
 }

src/java/org/apache/commons/cli2/validation/NumberValidator.java

@@ -100,19 +100,12 @@ public static NumberValidator getNumberInstance() {
     /** the upper bound for argument values */
     private Number maximum = null;
 
-    /**
-     * Creates a new NumberValidator.
-     */
-    public NumberValidator() {
-        this(NumberFormat.getInstance());
-    }
-
     /**
      * Creates a new NumberValidator based on the specified NumberFormat
      * @param format the format of numbers to accept
      */
     public NumberValidator(final NumberFormat format) {
-        this.format = format;
+        setFormat(format);
     }
 
     /**
@@ -124,7 +117,7 @@ public NumberValidator(final NumberFormat format) {
      */
     public void validate(final List values) throws InvalidArgumentException {
         for (final ListIterator i = values.listIterator(); i.hasNext();) {
-            final String value = (String)i.next();
+            final String value = (String) i.next();
 
             final ParsePosition pp = new ParsePosition(0);
             final Number number = format.parse(value, pp);
@@ -157,7 +150,7 @@ public NumberFormat getFormat() {
      *
      * @param format the format being used to validate argument values against.
      */
-    public void setFormat(NumberFormat format) {
+    protected void setFormat(NumberFormat format) {
         this.format = format;
     }
 

src/test/data/hidden.txt

@@ -0,0 +1 @@
+Hidden text file.

src/test/data/readable.txt

@@ -0,0 +1 @@
+Readable text file.

src/test/data/writable.txt

@@ -0,0 +1 @@
+Writable text file.

src/test/org/apache/commons/cli2/validation/DateValidatorTest.java

@@ -149,7 +149,12 @@ public void testMinimumBounds() throws InvalidArgumentException {
 
     public void testFormats() throws InvalidArgumentException {
         final DateValidator validator = new DateValidator(formats);
-        assertEquals("date formats are incorrect", formats, validator.getFormats());
+        assertEquals("date format is incorrect", 
+                     ((SimpleDateFormat)formats.get(0)).toPattern(), 
+                     ((SimpleDateFormat)validator.getFormats()[0]).toPattern());
+        assertEquals("date format is incorrect", 
+                     ((SimpleDateFormat)formats.get(1)).toPattern(), 
+                     ((SimpleDateFormat)validator.getFormats()[1]).toPattern());
     }
 
     public void testMaximumBounds() throws InvalidArgumentException {

src/test/org/apache/commons/cli2/validation/EnumValidatorTest.java

@@ -27,20 +27,22 @@ public class EnumValidatorTest extends TestCase {
     private final Set enumSet = new TreeSet(
             Arrays.asList(
                     new Object[]{"red", "green", "blue"}));
-    
+
     public void testValidate() throws InvalidArgumentException {
         final Object[] array = new Object[] { "red", "green"};
-        final List list = Arrays.asList(array);
-        final Validator validator = new EnumValidator(enumSet);
-
-        validator.validate(list);
+        {
+            final List list = Arrays.asList(array);        
+            final EnumValidator validator = new EnumValidator(enumSet);
+            assertEquals("valid values are incorrect", enumSet, validator.getValidValues());
+            validator.validate(list);
 
-        final Iterator i = list.iterator();
-        assertEquals("red", i.next());
-        assertEquals("green", i.next());
-        assertFalse(i.hasNext());
+            final Iterator i = list.iterator();
+            assertEquals("red", i.next());
+            assertEquals("green", i.next());
+            assertFalse(i.hasNext());
+        }
     }
-    
+
     public void testNonMember() {
         final Object[] array = new Object[] { "red", "pink"};
         final List list = Arrays.asList(array);

src/test/org/apache/commons/cli2/validation/NumberValidatorTest.java

@@ -1,5 +1,5 @@
-/**
- * Copyright 2003-2004 The Apache Software Foundation
+/*
+ * Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,27 +22,35 @@
 
 import junit.framework.TestCase;
 
+/**
+ * JUnit test case for NumberValidator.
+ *
+ * @author Rob Oxspring
+ * @author John Keyes
+ */
 public class NumberValidatorTest extends TestCase {
 
     public void testValidate_Number() throws InvalidArgumentException {
         final NumberFormat format = NumberFormat.getNumberInstance();
 
         final Object[] array = 
             new Object[] { 
-                format.format(1d), 
-                format.format(1.07d), 
-                format.format(-.45d)};
-        
-        final List list = Arrays.asList(array);
-        final Validator validator = NumberValidator.getNumberInstance();
+            format.format(1d), 
+            format.format(1.07d), 
+            format.format(-.45d)};
 
-        validator.validate(list);
+        {
+            final List list = Arrays.asList(array);
+            final Validator validator = NumberValidator.getNumberInstance();
 
-        final Iterator i = list.iterator();
-        assertEquals(1d, ((Number)i.next()).doubleValue(), 0.0001);
-        assertEquals(1.07d, ((Number)i.next()).doubleValue(), 0.0001);
-        assertEquals(-.45d, ((Number)i.next()).doubleValue(), 0.0001);
-        assertFalse(i.hasNext());
+            validator.validate(list);
+
+            final Iterator i = list.iterator();
+            assertEquals(1d, ((Number)i.next()).doubleValue(), 0.0001);
+            assertEquals(1.07d, ((Number)i.next()).doubleValue(), 0.0001);
+            assertEquals(-.45d, ((Number)i.next()).doubleValue(), 0.0001);
+            assertFalse(i.hasNext());
+        }
     }
 
     public void testValidate_Currency() throws InvalidArgumentException {
@@ -53,7 +61,9 @@ public void testValidate_Currency() throws InvalidArgumentException {
                 format.format(1.07),
                 format.format(-0.45)};
         final List list = Arrays.asList(array);
-        final Validator validator = NumberValidator.getCurrencyInstance();
+        
+        final NumberValidator validator = NumberValidator.getCurrencyInstance();
+        assertEquals("incorrect currency format", format, validator.getFormat());
 
         validator.validate(list);
 
@@ -118,7 +128,12 @@ public void testValidate_Maximum() {
         final Object[] array = new Object[] { "1", "107" };
         final List list = Arrays.asList(array);
         final NumberValidator validator = NumberValidator.getIntegerInstance();
-        validator.setMaximum(new Integer(100));
+        Integer max = new Integer(100);
+
+        validator.setMaximum(max);
+
+        assertTrue("no minimum set", validator.getMinimum() == null);
+        assertEquals("incorrect maximum value", max, validator.getMaximum());
 
         try {
             validator.validate(list);
@@ -133,7 +148,11 @@ public void testValidate_Minimum() {
         final Object[] array = new Object[] { "107", "1" };
         final List list = Arrays.asList(array);
         final NumberValidator validator = NumberValidator.getIntegerInstance();
-        validator.setMinimum(new Integer(100));
+        Integer min = new Integer(100);
+        validator.setMinimum(min);
+
+        assertTrue("no maximum set", validator.getMaximum() == null);
+        assertEquals("incorrect minimum value", min, validator.getMinimum());
 
         try {
             validator.validate(list);