jkeyes 2003/11/04 15:40:32
Modified: cli/src/test/org/apache/commons/cli2/validation
ClassValidatorTest.java
Log:
- removed TABs
Revision Changes Path
1.3 +89 -92
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassValidatorTest.java 4 Nov 2003 23:32:49 -0000 1.2
+++ ClassValidatorTest.java 4 Nov 2003 23:40:32 -0000 1.3
@@ -72,123 +72,120 @@
* @author Rob Oxspring
*/
public class ClassValidatorTest extends TestCase {
-
- private final static ResourceHelper resources =
+
+ 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);
- final Validator validator = new ClassValidator();
-
- validator.validate(list);
-
- final Iterator i = list.iterator();
- assertEquals("MyApp", i.next());
- assertEquals("org.apache.ant.Main", i.next());
- assertFalse(i.hasNext());
- }
- public void testValidate_NameBadStart() throws InvalidArgumentException {
+ public void testValidate_NameValid() throws InvalidArgumentException {
+ final Object[] array = new Object[] { "MyApp", "org.apache.ant.Main" };
+ final List list = Arrays.asList(array);
+ final Validator validator = new ClassValidator();
+
+ validator.validate(list);
+
+ final Iterator i = list.iterator();
+ assertEquals("MyApp", i.next());
+ assertEquals("org.apache.ant.Main", i.next());
+ assertFalse(i.hasNext());
+ }
+
+ public void testValidate_NameBadStart() throws InvalidArgumentException {
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!");
- }
+ 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(
+ assertEquals(
resources.getMessage(
"ClassValidator.error.bad.classname",
- className),
+ className),
ive.getMessage());
- }
- }
+ }
+ }
- public void testValidate_NameBadEnd() throws InvalidArgumentException {
+ public void testValidate_NameBadEnd() throws InvalidArgumentException {
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!");
- }
+
+ 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(
resources.getMessage(
"ClassValidator.error.bad.classname",
- className),
+ className),
ive.getMessage());
- }
- }
+ }
+ }
- public void testValidate_NameBadMiddle() throws InvalidArgumentException {
+ public void testValidate_NameBadMiddle() throws InvalidArgumentException {
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!");
- }
+
+ 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(
resources.getMessage(
"ClassValidator.error.bad.classname",
- className),
+ className),
ive.getMessage());
- }
- }
+ }
+ }
- public void testValidate_LoadValid() throws InvalidArgumentException {
- final Object[] array =
- new Object[] {
- "org.apache.commons.cli2.Option",
- "java.util.Vector" };
- final List list = Arrays.asList(array);
- final ClassValidator validator = new ClassValidator();
- validator.setLoadable(true);
-
- validator.validate(list);
-
- final Iterator i = list.iterator();
- assertEquals(
- "org.apache.commons.cli2.Option",
- ((Class) i.next()).getName());
- assertEquals("java.util.Vector", ((Class) i.next()).getName());
- assertFalse(i.hasNext());
- }
+ public void testValidate_LoadValid() throws InvalidArgumentException {
+ final Object[] array =
+ new Object[] {
+ "org.apache.commons.cli2.Option",
+ "java.util.Vector" };
+ final List list = Arrays.asList(array);
+ final ClassValidator validator = new ClassValidator();
+ validator.setLoadable(true);
+
+ validator.validate(list);
+
+ final Iterator i = list.iterator();
+ assertEquals(
+ "org.apache.commons.cli2.Option",
+ ((Class) i.next()).getName());
+ assertEquals("java.util.Vector", ((Class) i.next()).getName());
+ assertFalse(i.hasNext());
+ }
- public void testValidate_LoadInvalid() throws InvalidArgumentException {
+ public void testValidate_LoadInvalid() throws InvalidArgumentException {
final String className = "org.apache.commons.cli2.NonOption";
-
- final Object[] array =
- new Object[] {
- className,
- "java.util.Vectors" };
- final List list = Arrays.asList(array);
- final ClassValidator validator = new ClassValidator();
- validator.setLoadable(true);
-
- try {
- validator.validate(list);
- fail("Class Not Found");
- }
+
+ final Object[] array = new Object[] { className, "java.util.Vectors" };
+ final List list = Arrays.asList(array);
+ final ClassValidator validator = new ClassValidator();
+ validator.setLoadable(true);
+
+ try {
+ validator.validate(list);
+ fail("Class Not Found");
+ }
catch (InvalidArgumentException ive) {
assertEquals(
resources.getMessage(
"ClassValidator.error.class.notfound",
- className),
+ className),
ive.getMessage());
- }
- }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]