Author: sebb
Date: Mon Apr 18 22:57:51 2011
New Revision: 1094808
URL: http://svn.apache.org/viewvc?rev=1094808&view=rev
Log:
Tidy tests
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java?rev=1094808&r1=1094807&r2=1094808&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
Mon Apr 18 22:57:51 2011
@@ -20,8 +20,6 @@ import java.io.InputStream;
import junit.framework.TestCase;
-import org.apache.commons.validator.custom.CustomValidatorResources;
-
/**
* Test custom ValidatorResources.
*
@@ -55,11 +53,8 @@ public class CustomValidatorResourcesTes
public void testCustomResources() {
// Load resources
InputStream in = null;
- ValidatorResources resources = null;
-
try {
in = this.getClass().getResourceAsStream("TestNumber-config.xml");
- resources = new CustomValidatorResources(in);
} catch(Exception e) {
fail("Error loading resources: " + e);
} finally {
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java?rev=1094808&r1=1094807&r2=1094808&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java
Mon Apr 18 22:57:51 2011
@@ -201,7 +201,7 @@ public class EmailTest extends AbstractC
* Tests the email validation with ascii control characters.
* (i.e. Ascii chars 0 - 31 and 127)
*/
- public void testEmailWithControlChars() throws ValidatorException {
+ public void testEmailWithControlChars() {
EmailValidator validator = new EmailValidator();
for (char c = 0; c < 32; c++) {
assertFalse("Test control char " + ((int)c),
validator.isValid("foo" + c + "b...@domain.com"));
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java?rev=1094808&r1=1094807&r2=1094808&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
Mon Apr 18 22:57:51 2011
@@ -77,7 +77,7 @@ public class MultipleConfigFilesTest ext
* Check the forms and constants from different config files have
* been merged into the same FormSet.
*/
- public void testMergedConfig() throws ValidatorException {
+ public void testMergedConfig() {
// *********** Default Locale *******************
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java?rev=1094808&r1=1094807&r2=1094808&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java
Mon Apr 18 22:57:51 2011
@@ -30,12 +30,6 @@ public class ParameterTest extends Abstr
private static final String FORM_KEY = "nameForm";
- private static final String firstNameField = "firstName";
-
- private static final String middleNameField = "middleName";
-
- private static final String lastNameField = "lastName";
-
private String firstName;
private String middleName;
@@ -70,7 +64,7 @@ public class ParameterTest extends Abstr
/**
* Test all validations ran and passed.
*/
- public void testAllValid() throws ValidatorException {
+ public void testAllValid() {
// Create bean to run test on.
NameBean bean = createNameBean();
@@ -83,9 +77,8 @@ public class ParameterTest extends Abstr
validator.setParameter(Validator.LOCALE_PARAM, Locale.getDefault());
// Get results of the validation.
- ValidatorResults results = null;
try {
- results = validator.validate();
+ validator.validate();
} catch(Exception e) {
fail("Validator.validate() threw " + e);
}
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java?rev=1094808&r1=1094807&r2=1094808&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java
Mon Apr 18 22:57:51 2011
@@ -61,7 +61,7 @@ public class VarTest extends AbstractCom
/**
* With nothing provided, we should fail both because both are required.
*/
- public void testVars() throws ValidatorException {
+ public void testVars() {
Form form = resources.getForm(Locale.getDefault(), FORM_KEY);
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java?rev=1094808&r1=1094807&r2=1094808&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
Mon Apr 18 22:57:51 2011
@@ -120,8 +120,8 @@ public class BigDecimalValidatorTest ext
BigDecimal number20 = new BigDecimal("20");
BigDecimal number21 = new BigDecimal("21");
- float min = (float)10;
- float max = (float)20;
+ float min = 10;
+ float max = 20;
// Test isInRange()
assertFalse("isInRange(A) < min", validator.isInRange(number9, min,
max));
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java?rev=1094808&r1=1094807&r2=1094808&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
Mon Apr 18 22:57:51 2011
@@ -130,7 +130,7 @@ public class FloatValidatorTest extends
assertFalse("Too small +ve",
FloatValidator.getInstance().isValid(strTooSmallPositive, pattern));
// Validate Too Small -ve
- Double tooSmallNegative = new Double(tooSmallPositive.doubleValue() *
(double)-1);
+ Double tooSmallNegative = new Double(tooSmallPositive.doubleValue() *
-1);
String strTooSmallNegative = fmt.format(tooSmallNegative);
assertFalse("Too small -ve",
FloatValidator.getInstance().isValid(strTooSmallNegative, pattern));
}
