You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jk...@apache.org on 2003/11/05 00:32:49 UTC
cvs commit: jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/validation ClassValidatorTest.java
jkeyes 2003/11/04 15:32:49
Modified: cli/src/test/org/apache/commons/cli2/validation
ClassValidatorTest.java
Log:
- updated for i18n
- added Apache license
Revision Changes Path
1.2 +103 -21 jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java
Index: ClassValidatorTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassValidatorTest.java 18 Oct 2003 22:00:38 -0000 1.1
+++ ClassValidatorTest.java 4 Nov 2003 23:32:49 -0000 1.2
@@ -1,8 +1,62 @@
/*
- * Created on 25-Aug-2003
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache GroupImpl.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
*
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.commons.cli2.validation;
@@ -10,15 +64,18 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.cli2.resources.ResourceHelper;
+
import junit.framework.TestCase;
/**
- * @author Rob
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * @author Rob Oxspring
*/
public class ClassValidatorTest extends TestCase {
+
+ private final static ResourceHelper resources =
+ ResourceHelper.getResourceHelper(ClassValidatorTest.class);
+
public void testValidate_NameValid() throws InvalidArgumentException {
final Object[] array = new Object[] { "MyApp", "org.apache.ant.Main" };
final List list = Arrays.asList(array);
@@ -33,41 +90,61 @@
}
public void testValidate_NameBadStart() throws InvalidArgumentException {
- final Object[] array = new Object[] { "1stClass" };
+ final String className = "1stClass";
+ final Object[] array = new Object[] { className };
final List list = Arrays.asList(array);
final Validator validator = new ClassValidator();
try {
validator.validate(list);
fail("BadStart!");
- } catch (InvalidArgumentException ive) {
- assertEquals("Bad class name: 1stClass", ive.getMessage());
+ }
+ catch (InvalidArgumentException ive) {
+ assertEquals(
+ resources.getMessage(
+ "ClassValidator.error.bad.classname",
+ className),
+ ive.getMessage());
}
}
public void testValidate_NameBadEnd() throws InvalidArgumentException {
- final Object[] array = new Object[] { "My.Class." };
+ final String className = "My.Class.";
+
+ final Object[] array = new Object[] { className };
final List list = Arrays.asList(array);
final Validator validator = new ClassValidator();
try {
validator.validate(list);
fail("BadEnd!");
- } catch (InvalidArgumentException ive) {
- assertEquals("Bad class name: My.Class.", ive.getMessage());
+ }
+ catch (InvalidArgumentException ive) {
+ assertEquals(
+ resources.getMessage(
+ "ClassValidator.error.bad.classname",
+ className),
+ ive.getMessage());
}
}
public void testValidate_NameBadMiddle() throws InvalidArgumentException {
- final Object[] array = new Object[] { "My..Class" };
+ final String className = "My..Class";
+
+ final Object[] array = new Object[] { className };
final List list = Arrays.asList(array);
final Validator validator = new ClassValidator();
try {
validator.validate(list);
fail("BadMiddle!");
- } catch (InvalidArgumentException ive) {
- assertEquals("Bad class name: My..Class", ive.getMessage());
+ }
+ catch (InvalidArgumentException ive) {
+ assertEquals(
+ resources.getMessage(
+ "ClassValidator.error.bad.classname",
+ className),
+ ive.getMessage());
}
}
@@ -91,9 +168,11 @@
}
public void testValidate_LoadInvalid() throws InvalidArgumentException {
+ final String className = "org.apache.commons.cli2.NonOption";
+
final Object[] array =
new Object[] {
- "org.apache.commons.cli2.NonOption",
+ className,
"java.util.Vectors" };
final List list = Arrays.asList(array);
final ClassValidator validator = new ClassValidator();
@@ -102,10 +181,13 @@
try {
validator.validate(list);
fail("Class Not Found");
- } catch (InvalidArgumentException ive) {
- assertEquals(
- "Class not found: org.apache.commons.cli2.NonOption",
- ive.getMessage());
+ }
+ catch (InvalidArgumentException ive) {
+ assertEquals(
+ resources.getMessage(
+ "ClassValidator.error.class.notfound",
+ className),
+ ive.getMessage());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org