You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ni...@apache.org on 2005/10/31 18:51:36 UTC
svn commit: r329871 -
/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/
Author: niallp
Date: Mon Oct 31 09:50:55 2005
New Revision: 329871
URL: http://svn.apache.org/viewcvs?rev=329871&view=rev
Log:
Rename xml config files to match the tests they are used in
Added:
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/DateTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-date.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-regexp.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest-byteform.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/byteform.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest-config.xml
- copied, changed from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-import.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExceptionTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-exception.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExtensionTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-extension.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-locale.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleConfigFilesTest-1-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-multiple-config-1.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleConfigFilesTest-2-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-multiple-config-2.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleTests-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-multipletest.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredIfTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-requiredif.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredNameTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-name-required.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TestNumber-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-numeric.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TypeTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-type.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/VarTest-config.xml
- copied unchanged from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-var-test.xml
Removed:
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/byteform.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-date.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-exception.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-extension.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-import.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-locale.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-multiple-config-1.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-multiple-config-2.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-multipletest.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-name-required.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-numeric.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-regexp.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-requiredif.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-type.xml
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-var-test.xml
Modified:
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/DateTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExceptionTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExtensionTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleConfigFilesTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleTests.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredIfTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredNameTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TestNumber.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TypeTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/UrlTest.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ValidatorTestSuite.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/VarTest.java
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/DateTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/DateTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/DateTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/DateTest.java Mon Oct 31 09:50:55 2005
@@ -65,7 +65,7 @@
*/
protected void setUp() throws IOException, SAXException {
// Load resources
- loadResources("validator-date.xml");
+ loadResources("DateTest-config.xml");
}
protected void tearDown() {
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EmailTest.java Mon Oct 31 09:50:55 2005
@@ -72,7 +72,7 @@
* validator-regexp.xml.
*/
protected void setUp() throws IOException, SAXException {
- loadResources("validator-regexp.xml");
+ loadResources("EmailTest-config.xml");
}
protected void tearDown() {
Copied: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest-config.xml (from r329838, jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-import.xml)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest-config.xml?p2=jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest-config.xml&p1=jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-import.xml&r1=329838&r2=329871&rev=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/validator-import.xml (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest-config.xml Mon Oct 31 09:50:55 2005
@@ -1,17 +1,17 @@
-<!DOCTYPE form-validation PUBLIC
- "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd"
- [<!ENTITY byteform SYSTEM "byteform.xml">]>
-
-<form-validation>
- <global>
- <validator name="byte"
- classname="org.apache.commons.validator.TestTypeValidator"
- method="validateByte"
- methodParams="java.lang.Object,org.apache.commons.validator.Field"
- msg=""/>
- </global>
- <formset>
- &byteform;
- </formset>
-</form-validation>
+<!DOCTYPE form-validation PUBLIC
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd"
+ [<!ENTITY byteform SYSTEM "EntityImportTest-byteform.xml">]>
+
+<form-validation>
+ <global>
+ <validator name="byte"
+ classname="org.apache.commons.validator.TestTypeValidator"
+ method="validateByte"
+ methodParams="java.lang.Object,org.apache.commons.validator.Field"
+ msg=""/>
+ </global>
+ <formset>
+ &byteform;
+ </formset>
+</form-validation>
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/EntityImportTest.java Mon Oct 31 09:50:55 2005
@@ -1,68 +1,68 @@
-/*
- * $Header: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/ByteTest.java,v 1.14 2004/02/21 17:10:30 rleland Exp $
- * $Revision: 1.14 $
- * $Date: 2004/02/21 17:10:30 $
- *
- * ====================================================================
- * Copyright 2001-2004 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.commons.validator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import java.io.IOException;
-import org.xml.sax.SAXException;
-import java.util.Locale;
-import java.net.URL;
-
-
-/**
- * Tests entity imports.
- */
-public class EntityImportTest extends TestCommon {
-
- public EntityImportTest(String name) {
- super(name);
- }
-
- /**
- * Start the tests.
- *
- * @param theArgs the arguments. Not used
- */
- public static void main(String[] theArgs) {
- junit.awtui.TestRunner.main(new String[]{EntityImportTest.class.getName()});
- }
-
- /**
- * @return a test suite (<code>TestSuite</code>) that includes all methods
- * starting with "test"
- */
- public static Test suite() {
- // All methods starting with "test" will be executed in the test suite.
- return new TestSuite(EntityImportTest.class);
- }
-
- /**
- * Tests the entity import loading the <code>byteForm</code> form.
- */
- public void testEntityImport() throws Exception {
- URL url = getClass().getResource("validator-import.xml");
- ValidatorResources resources = new ValidatorResources(url.toExternalForm());
- assertNotNull("Form should be found", resources.getForm(Locale.getDefault(), "byteForm"));
- }
-}
+/*
+ * $Header: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/ByteTest.java,v 1.14 2004/02/21 17:10:30 rleland Exp $
+ * $Revision: 1.14 $
+ * $Date: 2004/02/21 17:10:30 $
+ *
+ * ====================================================================
+ * Copyright 2001-2004 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.commons.validator;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import java.io.IOException;
+import org.xml.sax.SAXException;
+import java.util.Locale;
+import java.net.URL;
+
+
+/**
+ * Tests entity imports.
+ */
+public class EntityImportTest extends TestCommon {
+
+ public EntityImportTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Start the tests.
+ *
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+ junit.awtui.TestRunner.main(new String[]{EntityImportTest.class.getName()});
+ }
+
+ /**
+ * @return a test suite (<code>TestSuite</code>) that includes all methods
+ * starting with "test"
+ */
+ public static Test suite() {
+ // All methods starting with "test" will be executed in the test suite.
+ return new TestSuite(EntityImportTest.class);
+ }
+
+ /**
+ * Tests the entity import loading the <code>byteForm</code> form.
+ */
+ public void testEntityImport() throws Exception {
+ URL url = getClass().getResource("EntityImportTest-config.xml");
+ ValidatorResources resources = new ValidatorResources(url.toExternalForm());
+ assertNotNull("Form should be found", resources.getForm(Locale.getDefault(), "byteForm"));
+ }
+}
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExceptionTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExceptionTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExceptionTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExceptionTest.java Mon Oct 31 09:50:55 2005
@@ -50,7 +50,7 @@
* validator-exception.xml.
*/
protected void setUp() throws IOException, SAXException {
- loadResources("validator-exception.xml");
+ loadResources("ExceptionTest-config.xml");
}
/**
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExtensionTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExtensionTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExtensionTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ExtensionTest.java Mon Oct 31 09:50:55 2005
@@ -98,7 +98,7 @@
InputStream in = null;
try {
- in = this.getClass().getResourceAsStream("validator-extension.xml");
+ in = this.getClass().getResourceAsStream("ExtensionTest-config.xml");
resources = new ValidatorResources(in);
} finally {
if (in != null) {
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java Mon Oct 31 09:50:55 2005
@@ -78,7 +78,7 @@
protected void setUp()
throws IOException, SAXException {
// Load resources
- loadResources("validator-locale.xml");
+ loadResources("LocaleTest-config.xml");
}
/** The teardown method for JUnit */
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleConfigFilesTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleConfigFilesTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleConfigFilesTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleConfigFilesTest.java Mon Oct 31 09:50:55 2005
@@ -65,9 +65,9 @@
InputStream[] streams =
new InputStream[] {
this.getClass().getResourceAsStream(
- "validator-multiple-config-1.xml"),
+ "MultipleConfigFilesTest-1-config.xml"),
this.getClass().getResourceAsStream(
- "validator-multiple-config-2.xml")};
+ "MultipleConfigFilesTest-2-config.xml")};
this.resources = new ValidatorResources(streams);
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleTests.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleTests.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleTests.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/MultipleTests.java Mon Oct 31 09:50:55 2005
@@ -75,7 +75,7 @@
*/
protected void setUp() throws IOException, SAXException {
// Load resources
- loadResources("validator-multipletest.xml");
+ loadResources("MultipleTests-config.xml");
}
protected void tearDown() {
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredIfTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredIfTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredIfTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredIfTest.java Mon Oct 31 09:50:55 2005
@@ -73,7 +73,7 @@
*/
protected void setUp() throws IOException, SAXException {
// Load resources
- loadResources("validator-requiredif.xml");
+ loadResources("RequiredIfTest-config.xml");
}
protected void tearDown() {
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredNameTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredNameTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredNameTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/RequiredNameTest.java Mon Oct 31 09:50:55 2005
@@ -74,7 +74,7 @@
*/
protected void setUp() throws IOException, SAXException {
// Load resources
- loadResources("validator-name-required.xml");
+ loadResources("RequiredNameTest-config.xml");
}
protected void tearDown() {
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TestNumber.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TestNumber.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TestNumber.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TestNumber.java Mon Oct 31 09:50:55 2005
@@ -52,7 +52,7 @@
*/
protected void setUp() throws IOException, SAXException {
// Load resources
- loadResources("validator-numeric.xml");
+ loadResources("TestNumber-config.xml");
}
protected void tearDown() {
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TypeTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TypeTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TypeTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/TypeTest.java Mon Oct 31 09:50:55 2005
@@ -75,7 +75,7 @@
*/
protected void setUp() throws IOException, SAXException {
// Load resources
- loadResources("validator-type.xml");
+ loadResources("TypeTest-config.xml");
}
protected void tearDown() {
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/UrlTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/UrlTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/UrlTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/UrlTest.java Mon Oct 31 09:50:55 2005
@@ -52,7 +52,6 @@
public void testIsValid() {
testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES);
- System.out.println("\nTesting options ....");
setUp();
int options =
UrlValidator.ALLOW_2_SLASHES
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ValidatorTestSuite.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ValidatorTestSuite.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ValidatorTestSuite.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/ValidatorTestSuite.java Mon Oct 31 09:50:55 2005
@@ -40,31 +40,32 @@
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(EntityImportTest.suite());
- suite.addTest(DateTest.suite());
- suite.addTest(RequiredNameTest.suite());
- suite.addTest(RequiredIfTest.suite());
- suite.addTest(MultipleTests.suite());
- suite.addTestSuite(MultipleConfigFilesTest.class);
+ suite.addTestSuite(ExceptionTest.class);
+
suite.addTest(ByteTest.suite());
- suite.addTest(ShortTest.suite());
- suite.addTest(IntegerTest.suite());
- suite.addTest(LongTest.suite());
- suite.addTest(FloatTest.suite());
+ suite.addTestSuite(CreditCardValidatorTest.class);
+ suite.addTest(DateTest.suite());
suite.addTest(DoubleTest.suite());
- suite.addTest(TypeTest.suite());
- suite.addTest(ExtensionTest.suite());
suite.addTest(EmailTest.suite());
- suite.addTestSuite(CreditCardValidatorTest.class);
+ suite.addTest(EntityImportTest.suite());
+ suite.addTest(ExtensionTest.suite());
+ suite.addTestSuite(FlagsTest.class);
+ suite.addTestSuite(FieldTest.class);
+ suite.addTest(FloatTest.suite());
+ suite.addTest(IntegerTest.suite());
suite.addTestSuite(ISBNValidatorTest.class);
- suite.addTest(ValidatorTest.suite());
suite.addTest(LocaleTest.suite());
- suite.addTestSuite(FieldTest.class);
- suite.addTestSuite(FlagsTest.class);
- suite.addTestSuite(ExceptionTest.class);
+ suite.addTest(LongTest.suite());
+ suite.addTestSuite(MultipleConfigFilesTest.class);
+ suite.addTest(MultipleTests.suite());
+ suite.addTest(RequiredIfTest.suite());
+ suite.addTest(RequiredNameTest.suite());
+ suite.addTest(RetrieveFormTest.suite());
+ suite.addTest(ShortTest.suite());
+ suite.addTest(TypeTest.suite());
suite.addTest(UrlTest.suite());
+ suite.addTest(ValidatorTest.suite());
suite.addTest(VarTest.suite());
- suite.addTest(RetrieveFormTest.suite());
return suite;
}
Modified: jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/VarTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/VarTest.java?rev=329871&r1=329870&r2=329871&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/VarTest.java (original)
+++ jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/VarTest.java Mon Oct 31 09:50:55 2005
@@ -75,7 +75,7 @@
*/
protected void setUp() throws IOException, SAXException {
// Load resources
- loadResources("validator-var-test.xml");
+ loadResources("VarTest-config.xml");
}
protected void tearDown() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org