- add tests for UrlValidator

- fix FileValidator hidden file test

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

Author: John Keyes

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

@@ -121,7 +121,7 @@ public void testValidate_HiddenFile() throws InvalidArgumentException {
         // make file hidden on Windows
         attribute("H");
 
-        final Object[] array = new Object[] { ".hidden", "src" };
+        final Object[] array = new Object[] { "src/test/data/.hidden.txt", "src" };
         final List list = Arrays.asList(array);
         final FileValidator validator = FileValidator.getExistingFileInstance();
         validator.setHidden(true);

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

@@ -37,19 +37,49 @@ public void testValidate() throws InvalidArgumentException, MalformedURLExceptio
         assertEquals(new URL("file:///etc"), i.next());
         assertFalse(i.hasNext());
     }
-    
-    public void testBadProtocol() {
-        final Object[] array = new Object[] { "http://www.apache.org/", "file:///etc"};
+
+    public void testMalformedURL() throws InvalidArgumentException, MalformedURLException {
+        final Object[] array = new Object[] { "www.apache.org"};
         final List list = Arrays.asList(array);
-        final UrlValidator validator = new UrlValidator();
-        validator.setProtocol("http");
+        final Validator validator = new UrlValidator();
 
-        try{
+        try {
             validator.validate(list);
-            fail("Expected InvalidArgumentException");
         }
         catch(InvalidArgumentException e){
-            assertEquals("file:///etc",e.getMessage());
+            assertEquals("Cannot understand url: www.apache.org",e.getMessage());
+        }
+        
+    }
+
+    public void testBadProtocol() {
+        {
+            final Object[] array = new Object[] { "http://www.apache.org/", "file:///etc"};
+            final List list = Arrays.asList(array);
+            final UrlValidator validator = new UrlValidator();
+            validator.setProtocol("http");
+    
+            assertEquals("incorrect protocol", "http", validator.getProtocol());
+            try{
+                validator.validate(list);
+                fail("Expected InvalidArgumentException");
+            }
+            catch(InvalidArgumentException e){
+                assertEquals("file:///etc",e.getMessage());
+            }
+        }
+        {
+            final Object[] array = new Object[] { "http://www.apache.org/", "file:///etc"};
+            final List list = Arrays.asList(array);
+            final UrlValidator validator = new UrlValidator("http");
+    
+            try{
+                validator.validate(list);
+                fail("Expected InvalidArgumentException");
+            }
+            catch(InvalidArgumentException e){
+                assertEquals("file:///etc",e.getMessage());
+            }
         }
     }
 }