This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git
The following commit(s) were added to refs/heads/master by this push:
new b4d7e945 Fix some Checkstyle issues in tests
b4d7e945 is described below
commit b4d7e9452f75ba3dc1acc1cd59c6575b50192278
Author: Gary Gregory <[email protected]>
AuthorDate: Sun May 5 11:10:33 2024 -0400
Fix some Checkstyle issues in tests
- Port to JUnit 5 assertThrows
- Whitespace
---
pom.xml | 2 +
src/conf/checkstyle-suppressions.xml | 13 ++--
.../commons/validator/routines/ISSNValidator.java | 4 --
.../commons/validator/AbstractNumberTest.java | 14 ++---
.../org/apache/commons/validator/ByteTest.java | 4 +-
.../validator/CustomValidatorResourcesTest.java | 3 +-
.../org/apache/commons/validator/DateTest.java | 4 +-
.../org/apache/commons/validator/DoubleTest.java | 4 +-
.../org/apache/commons/validator/EmailTest.java | 11 ++--
.../apache/commons/validator/ExceptionTest.java | 11 ++--
.../apache/commons/validator/ExtensionTest.java | 8 +--
.../org/apache/commons/validator/FloatTest.java | 4 +-
.../validator/GenericTypeValidatorTest.java | 4 +-
.../commons/validator/GenericValidatorImpl.java | 22 +++----
.../org/apache/commons/validator/IntegerTest.java | 4 +-
.../org/apache/commons/validator/LocaleTest.java | 4 +-
.../org/apache/commons/validator/LongTest.java | 4 +-
.../commons/validator/MultipleConfigFilesTest.java | 20 +++----
.../org/apache/commons/validator/MultipleTest.java | 4 +-
.../apache/commons/validator/RequiredIfTest.java | 4 +-
.../apache/commons/validator/RequiredNameTest.java | 4 +-
.../org/apache/commons/validator/ShortTest.java | 4 +-
.../commons/validator/ValidatorResultsTest.java | 30 +++++-----
.../java/org/apache/commons/validator/VarTest.java | 4 +-
.../routines/BigDecimalValidatorTest.java | 14 ++---
.../routines/BigIntegerValidatorTest.java | 14 ++---
.../validator/routines/ByteValidatorTest.java | 14 ++---
.../validator/routines/CalendarValidatorTest.java | 14 ++---
.../validator/routines/CodeValidatorTest.java | 70 +++++++++++-----------
.../routines/CreditCardValidatorTest.java | 12 ++--
.../validator/routines/CurrencyValidatorTest.java | 68 ++++++++++-----------
.../validator/routines/DateValidatorTest.java | 14 ++---
.../routines/DomainValidatorStartupTest.java | 8 +--
.../validator/routines/DomainValidatorTest.java | 26 ++++----
.../validator/routines/DoubleValidatorTest.java | 14 ++---
.../validator/routines/EmailValidatorTest.java | 20 +++----
.../validator/routines/FloatValidatorTest.java | 14 ++---
.../validator/routines/IBANValidatorTest.java | 20 +++----
.../validator/routines/ISSNValidatorTest.java | 53 ++++------------
.../routines/InetAddressValidatorTest.java | 6 +-
.../validator/routines/IntegerValidatorTest.java | 14 ++---
.../validator/routines/LongValidatorTest.java | 14 ++---
.../validator/routines/ShortValidatorTest.java | 14 ++---
.../validator/routines/UrlValidatorTest.java | 6 +-
.../routines/checkdigit/CUSIPCheckDigitTest.java | 4 +-
.../routines/checkdigit/ISINCheckDigitTest.java | 2 +-
.../checkdigit/ModulusTenCUSIPCheckDigitTest.java | 4 +-
.../checkdigit/ModulusTenSedolCheckDigitTest.java | 2 +-
.../routines/checkdigit/SedolCheckDigitTest.java | 2 +-
.../apache/commons/validator/util/FlagsTest.java | 4 +-
.../commons/validator/util/ValidatorUtilsTest.java | 2 +-
51 files changed, 311 insertions(+), 328 deletions(-)
diff --git a/pom.xml b/pom.xml
index e2ffc8fd..5e0729e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,6 +144,7 @@
<!-- Needed to define config_loc -->
<propertyExpansion>config_loc=${basedir}/src/conf</propertyExpansion>
<enableRulesSummary>false</enableRulesSummary>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</plugin>
<plugin>
@@ -236,6 +237,7 @@
<!-- Needed to define config_loc -->
<propertyExpansion>config_loc=${basedir}/src/conf</propertyExpansion>
<enableRulesSummary>false</enableRulesSummary>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<reportSets>
<reportSet>
diff --git a/src/conf/checkstyle-suppressions.xml
b/src/conf/checkstyle-suppressions.xml
index 97d04bf3..6b5631f9 100644
--- a/src/conf/checkstyle-suppressions.xml
+++ b/src/conf/checkstyle-suppressions.xml
@@ -21,8 +21,13 @@ limitations under the License.
"https://checkstyle.org/dtds/suppressions_1_0.dtd";>
<!-- SEE: http://checkstyle.sourceforge.net/config.html#Examples -->
<suppressions>
- <suppress checks="ParameterNumber" files="Field.java"/> <!-- two private
methods -->
-
- <!-- Maven generated code -->
- <suppress checks=".*" files="[/\\]target[/\\]"/>
+ <suppress checks="ParameterNumber" files="Field.java"/> <!-- two private
methods -->
+ <!-- Maven generated code -->
+ <suppress checks=".*" files="[/\\]target[/\\]"/>
+ <!-- Tests -->
+ <suppress checks="MagicNumber" files="src[/\\]test[/\\]java[/\\]" />
+ <suppress checks="JavadocMethod" files="src[/\\]test[/\\]java[/\\]" />
+ <suppress checks="JavadocPackage" files="src[/\\]test[/\\]java[/\\]" />
+ <suppress checks="JavadocVariable" files="src[/\\]test[/\\]java[/\\]" />
+ <suppress checks="ParameterNumber" files="src[/\\]test[/\\]java[/\\]" />
</suppressions>
diff --git
a/src/main/java/org/apache/commons/validator/routines/ISSNValidator.java
b/src/main/java/org/apache/commons/validator/routines/ISSNValidator.java
index 9d6b41d2..60676643 100644
--- a/src/main/java/org/apache/commons/validator/routines/ISSNValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/ISSNValidator.java
@@ -106,16 +106,13 @@ public class ISSNValidator implements Serializable {
* if the input ISSN code is not valid
*/
public String convertToEAN13(final String issn, final String suffix) {
-
if (suffix == null || !suffix.matches("\\d\\d")) {
throw new IllegalArgumentException("Suffix must be two digits: '"
+ suffix + "'");
}
-
final Object result = validate(issn);
if (result == null) {
return null;
}
-
// Calculate the new EAN-13 code
final String input = result.toString();
String ean13 = ISSN_PREFIX + input.substring(0, input.length() - 1) +
suffix;
@@ -126,7 +123,6 @@ public class ISSNValidator implements Serializable {
} catch (final CheckDigitException e) { // Should not happen
throw new IllegalArgumentException("Check digit error for '" +
ean13 + "' - " + e.getMessage());
}
-
}
/**
diff --git a/src/test/java/org/apache/commons/validator/AbstractNumberTest.java
b/src/test/java/org/apache/commons/validator/AbstractNumberTest.java
index 2063d11d..24e0cb7b 100644
--- a/src/test/java/org/apache/commons/validator/AbstractNumberTest.java
+++ b/src/test/java/org/apache/commons/validator/AbstractNumberTest.java
@@ -34,12 +34,12 @@ public abstract class AbstractNumberTest extends
AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected String FORM_KEY;
+ protected String formKey;
/**
* The key used to retrieve the validator action.
*/
- protected String ACTION;
+ protected String action;
/**
* Load <code>ValidatorResources</code> from validator-numeric.xml.
@@ -84,7 +84,7 @@ public abstract class AbstractNumberTest extends
AbstractCommonTest {
protected void valueTest(final Object info, final boolean passed) throws
ValidatorException {
// Construct validator based on the loaded resources
// and the form key
- final Validator validator = new Validator(resources, FORM_KEY);
+ final Validator validator = new Validator(resources, formKey);
// add the name bean to the validator as a resource
// for the validations to be performed on.
validator.setParameter(Validator.BEAN_PARAM, info);
@@ -100,10 +100,10 @@ public abstract class AbstractNumberTest extends
AbstractCommonTest {
final ValidatorResult result = results.getValidatorResult("value");
- assertNotNull(result, () -> ACTION + " value ValidatorResult should
not be null.");
- assertTrue(result.containsAction(ACTION), () -> ACTION + " value
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(passed ? result.isValid(ACTION) : !result.isValid(ACTION),
- () -> ACTION + " value ValidatorResult for the '" + ACTION +
"' action should have " + (passed ? "passed" : "failed") + ".");
+ assertNotNull(result, () -> action + " value ValidatorResult should
not be null.");
+ assertTrue(result.containsAction(action), () -> action + " value
ValidatorResult should contain the '" + action + "' action.");
+ assertTrue(passed ? result.isValid(action) : !result.isValid(action),
+ () -> action + " value ValidatorResult for the '" + action +
"' action should have " + (passed ? "passed" : "failed") + ".");
}
}
diff --git a/src/test/java/org/apache/commons/validator/ByteTest.java
b/src/test/java/org/apache/commons/validator/ByteTest.java
index 142a11a4..481d0ba3 100644
--- a/src/test/java/org/apache/commons/validator/ByteTest.java
+++ b/src/test/java/org/apache/commons/validator/ByteTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
public class ByteTest extends AbstractNumberTest {
public ByteTest() {
- ACTION = "byte";
- FORM_KEY = "byteForm";
+ action = "byte";
+ formKey = "byteForm";
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
b/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
index 4c99c26c..eedf2443 100644
---
a/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
+++
b/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
@@ -59,7 +59,8 @@ public class CustomValidatorResourcesTest {
if (in != null) {
in.close();
}
- } catch (final Exception e) {
+ } catch (final Exception ignore) {
+ // ignore
}
}
}
diff --git a/src/test/java/org/apache/commons/validator/DateTest.java
b/src/test/java/org/apache/commons/validator/DateTest.java
index a24a33f0..d8dec06e 100644
--- a/src/test/java/org/apache/commons/validator/DateTest.java
+++ b/src/test/java/org/apache/commons/validator/DateTest.java
@@ -34,12 +34,12 @@ public class DateTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected String FORM_KEY = "dateForm";
+ protected static final String FORM_KEY = "dateForm";
/**
* The key used to retrieve the validator action.
*/
- protected String ACTION = "date";
+ protected static final String ACTION = "date";
/**
* Load <code>ValidatorResources</code> from validator-numeric.xml.
diff --git a/src/test/java/org/apache/commons/validator/DoubleTest.java
b/src/test/java/org/apache/commons/validator/DoubleTest.java
index 15f2919c..b0b3b4a1 100644
--- a/src/test/java/org/apache/commons/validator/DoubleTest.java
+++ b/src/test/java/org/apache/commons/validator/DoubleTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
public class DoubleTest extends AbstractNumberTest {
public DoubleTest() {
- ACTION = "double";
- FORM_KEY = "doubleForm";
+ action = "double";
+ formKey = "doubleForm";
}
/**
diff --git a/src/test/java/org/apache/commons/validator/EmailTest.java
b/src/test/java/org/apache/commons/validator/EmailTest.java
index cd9b4b9e..5718d5fc 100644
--- a/src/test/java/org/apache/commons/validator/EmailTest.java
+++ b/src/test/java/org/apache/commons/validator/EmailTest.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
+import org.junit.Ignore;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
@@ -38,12 +39,12 @@ public class EmailTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "emailForm";
+ protected static final String FORM_KEY = "emailForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "email";
+ protected static final String ACTION = "email";
/**
* These test values derive directly from RFC 822 & Mail::RFC822::Address
& RFC::RFC822::Address perl test.pl For traceability don't combine these test
@@ -90,7 +91,8 @@ public class EmailTest extends AbstractCommonTest {
*
* FIXME This test fails so disable it with a
leading _ for 1.1.4 release. The real solution is to fix the email parsing.
*/
- public void _testEmailFromPerl() throws ValidatorException {
+ @Ignore
+ public void testEmailFromPerl() throws ValidatorException {
final ValueBean info = new ValueBean();
for (final ResultPair element : testEmailFromPerl) {
info.setValue(element.item);
@@ -106,7 +108,8 @@ public class EmailTest extends AbstractCommonTest {
*
* @throws ValidatorException
*/
- public void _testEmailUserName() throws ValidatorException {
+ @Ignore
+ public void testEmailUserName() throws ValidatorException {
final ValueBean info = new ValueBean();
info.setValue("[email protected]");
valueTest(info, true);
diff --git a/src/test/java/org/apache/commons/validator/ExceptionTest.java
b/src/test/java/org/apache/commons/validator/ExceptionTest.java
index ec39c666..e5ae760c 100644
--- a/src/test/java/org/apache/commons/validator/ExceptionTest.java
+++ b/src/test/java/org/apache/commons/validator/ExceptionTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
+import org.junit.Ignore;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
@@ -33,12 +34,12 @@ public class ExceptionTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "exceptionForm";
+ protected static final String FORM_KEY = "exceptionForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "raiseException";
+ protected static final String ACTION = "raiseException";
/**
* Load <code>ValidatorResources</code> from validator-exception.xml.
@@ -79,7 +80,8 @@ public class ExceptionTest extends AbstractCommonTest {
* N.B. This test has been removed (renamed) as it currently serves no
purpose. If/When exception handling is changed in Validator 2.0 it can be
* reconsidered then.
*/
- public void XtestCheckedException() {
+ @Ignore
+ public void testCheckedException() {
// Create bean to run test on.
final ValueBean info = new ValueBean();
info.setValue("CHECKED");
@@ -117,7 +119,8 @@ public class ExceptionTest extends AbstractCommonTest {
* N.B. This test has been removed (renamed) as it currently serves no
purpose. If/When exception handling is changed in Validator 2.0 it can be
* reconsidered then.
*/
- public void XtestRuntimeException() throws ValidatorException {
+ @Ignore
+ public void testRuntimeException() throws ValidatorException {
// Create bean to run test on.
final ValueBean info = new ValueBean();
info.setValue("RUNTIME");
diff --git a/src/test/java/org/apache/commons/validator/ExtensionTest.java
b/src/test/java/org/apache/commons/validator/ExtensionTest.java
index 1c2a1bc8..b03ec9ce 100644
--- a/src/test/java/org/apache/commons/validator/ExtensionTest.java
+++ b/src/test/java/org/apache/commons/validator/ExtensionTest.java
@@ -38,22 +38,22 @@ public class ExtensionTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "nameForm";
+ protected static final String FORM_KEY = "nameForm";
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY2 = "nameForm2";
+ protected static final String FORM_KEY2 = "nameForm2";
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String CHECK_MSG_KEY = "nameForm.lastname.displayname";
+ protected static final String CHECK_MSG_KEY =
"nameForm.lastname.displayname";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "required";
+ protected static final String ACTION = "required";
/**
* Resources used for validation tests.
diff --git a/src/test/java/org/apache/commons/validator/FloatTest.java
b/src/test/java/org/apache/commons/validator/FloatTest.java
index f67ad187..a6e5e179 100644
--- a/src/test/java/org/apache/commons/validator/FloatTest.java
+++ b/src/test/java/org/apache/commons/validator/FloatTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
public class FloatTest extends AbstractNumberTest {
public FloatTest() {
- ACTION = "float";
- FORM_KEY = "floatForm";
+ action = "float";
+ formKey = "floatForm";
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
b/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
index 054dd014..3188f7a9 100644
--- a/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
@@ -38,12 +38,12 @@ public class GenericTypeValidatorTest extends
AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "typeForm";
+ protected static final String FORM_KEY = "typeForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "byte";
+ protected static final String ACTION = "byte";
/**
* Tests the locale.
diff --git
a/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
b/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
index 701622c0..1089cc75 100644
--- a/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
+++ b/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
@@ -23,11 +23,11 @@ import org.apache.commons.validator.util.ValidatorUtils;
*/
public class GenericValidatorImpl {
- public final static String FIELD_TEST_NULL = "NULL";
+ public static final String FIELD_TEST_NULL = "NULL";
- public final static String FIELD_TEST_NOTNULL = "NOTNULL";
+ public static final String FIELD_TEST_NOTNULL = "NOTNULL";
- public final static String FIELD_TEST_EQUAL = "EQUAL";
+ public static final String FIELD_TEST_EQUAL = "EQUAL";
private static boolean isStringOrNull(final Object o) {
if (o == null) {
@@ -187,7 +187,7 @@ public class GenericValidatorImpl {
if (dependIndexed == null) {
dependIndexed = "false";
}
- boolean this_required = false;
+ boolean thisRequired = false;
if (field.isIndexed() && Boolean.parseBoolean(dependIndexed)) {
final String key = field.getKey();
if (key.contains("[") && key.contains("]")) {
@@ -198,25 +198,25 @@ public class GenericValidatorImpl {
final String dependVal = ValidatorUtils.getValueAsString(form,
dependProp);
if (dependTest.equals(FIELD_TEST_NULL)) {
if (dependVal != null && !dependVal.isEmpty()) {
- this_required = false;
+ thisRequired = false;
} else {
- this_required = true;
+ thisRequired = true;
}
}
if (dependTest.equals(FIELD_TEST_NOTNULL)) {
if (dependVal != null && !dependVal.isEmpty()) {
- this_required = true;
+ thisRequired = true;
} else {
- this_required = false;
+ thisRequired = false;
}
}
if (dependTest.equals(FIELD_TEST_EQUAL)) {
- this_required = dependTestValue.equalsIgnoreCase(dependVal);
+ thisRequired = dependTestValue.equalsIgnoreCase(dependVal);
}
if (fieldJoin.equalsIgnoreCase("AND")) {
- required = required && this_required;
+ required = required && thisRequired;
} else {
- required = required || this_required;
+ required = required || thisRequired;
}
i++;
}
diff --git a/src/test/java/org/apache/commons/validator/IntegerTest.java
b/src/test/java/org/apache/commons/validator/IntegerTest.java
index ca4c1a13..77d064a2 100644
--- a/src/test/java/org/apache/commons/validator/IntegerTest.java
+++ b/src/test/java/org/apache/commons/validator/IntegerTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
public class IntegerTest extends AbstractNumberTest {
public IntegerTest() {
- FORM_KEY = "intForm";
- ACTION = "int";
+ formKey = "intForm";
+ action = "int";
}
/**
diff --git a/src/test/java/org/apache/commons/validator/LocaleTest.java
b/src/test/java/org/apache/commons/validator/LocaleTest.java
index 7fc5b0c7..7720627c 100644
--- a/src/test/java/org/apache/commons/validator/LocaleTest.java
+++ b/src/test/java/org/apache/commons/validator/LocaleTest.java
@@ -35,10 +35,10 @@ public class LocaleTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "nameForm";
+ protected static final String FORM_KEY = "nameForm";
/** The key used to retrieve the validator action. */
- protected static String ACTION = "required";
+ protected static final String ACTION = "required";
/**
* Load <code>ValidatorResources</code> from validator-locale.xml.
diff --git a/src/test/java/org/apache/commons/validator/LongTest.java
b/src/test/java/org/apache/commons/validator/LongTest.java
index e2d238ea..31ff580b 100644
--- a/src/test/java/org/apache/commons/validator/LongTest.java
+++ b/src/test/java/org/apache/commons/validator/LongTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
public class LongTest extends AbstractNumberTest {
public LongTest() {
- FORM_KEY = "longForm";
- ACTION = "long";
+ formKey = "longForm";
+ action = "long";
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
index c848c6ed..bab1312a 100644
--- a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
@@ -128,22 +128,22 @@ public class MultipleConfigFilesTest {
// *********** 'fr' locale *******************
// Check the form from the first config file exists
- final Form form1_fr = resources.getForm("fr", "", "", "testForm1_fr");
- assertNotNull(form1_fr, "Form 'testForm1_fr' not found");
+ final Form form1Fr = resources.getForm("fr", "", "", "testForm1_fr");
+ assertNotNull(form1Fr, "Form 'testForm1_fr' not found");
// Check the form from the second config file exists
- final Form form2_fr = resources.getForm("fr", "", "", "testForm2_fr");
- assertNotNull(form2_fr, "Form 'testForm2_fr' not found");
+ final Form form2Fr = resources.getForm("fr", "", "", "testForm2_fr");
+ assertNotNull(form2Fr, "Form 'testForm2_fr' not found");
// Check the Constants for the form from the first config file
- final Field field1_fr = form1_fr.getField("testProperty1_fr");
- assertEquals("testConstValue1_fr", field1_fr.getVarValue("var11_fr"),
"testProperty1_fr - const 1");
- assertEquals("testConstValue2_fr", field1_fr.getVarValue("var12_fr"),
"testProperty1_fr - const 2");
+ final Field field1Fr = form1Fr.getField("testProperty1_fr");
+ assertEquals("testConstValue1_fr", field1Fr.getVarValue("var11_fr"),
"testProperty1_fr - const 1");
+ assertEquals("testConstValue2_fr", field1Fr.getVarValue("var12_fr"),
"testProperty1_fr - const 2");
// Check the Constants for the form from the second config file
- final Field field2_fr = form2_fr.getField("testProperty2_fr");
- assertEquals("testConstValue1_fr", field2_fr.getVarValue("var21_fr"),
"testProperty2_fr - const 1");
- assertEquals("testConstValue2_fr", field2_fr.getVarValue("var22_fr"),
"testProperty2_fr - const 2");
+ final Field field2Fr = form2Fr.getField("testProperty2_fr");
+ assertEquals("testConstValue1_fr", field2Fr.getVarValue("var21_fr"),
"testProperty2_fr - const 1");
+ assertEquals("testConstValue2_fr", field2Fr.getVarValue("var22_fr"),
"testProperty2_fr - const 2");
}
/**
diff --git a/src/test/java/org/apache/commons/validator/MultipleTest.java
b/src/test/java/org/apache/commons/validator/MultipleTest.java
index a12a20f5..16f0ac36 100644
--- a/src/test/java/org/apache/commons/validator/MultipleTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleTest.java
@@ -34,12 +34,12 @@ public class MultipleTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "nameForm";
+ protected static final String FORM_KEY = "nameForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "required";
+ protected static final String ACTION = "required";
/**
* Load <code>ValidatorResources</code> from validator-multipletest.xml.
diff --git a/src/test/java/org/apache/commons/validator/RequiredIfTest.java
b/src/test/java/org/apache/commons/validator/RequiredIfTest.java
index ad6c72ab..5fc9a13d 100644
--- a/src/test/java/org/apache/commons/validator/RequiredIfTest.java
+++ b/src/test/java/org/apache/commons/validator/RequiredIfTest.java
@@ -34,12 +34,12 @@ public class RequiredIfTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "nameForm";
+ protected static final String FORM_KEY = "nameForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "requiredif";
+ protected static final String ACTION = "requiredif";
/**
* Load <code>ValidatorResources</code> from validator-requiredif.xml.
diff --git a/src/test/java/org/apache/commons/validator/RequiredNameTest.java
b/src/test/java/org/apache/commons/validator/RequiredNameTest.java
index 0a8bdc94..44b86ac3 100644
--- a/src/test/java/org/apache/commons/validator/RequiredNameTest.java
+++ b/src/test/java/org/apache/commons/validator/RequiredNameTest.java
@@ -34,12 +34,12 @@ public class RequiredNameTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "nameForm";
+ protected static final String FORM_KEY = "nameForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "required";
+ protected static final String ACTION = "required";
/**
* Load <code>ValidatorResources</code> from validator-name-required.xml.
diff --git a/src/test/java/org/apache/commons/validator/ShortTest.java
b/src/test/java/org/apache/commons/validator/ShortTest.java
index dfb623a5..53a08f69 100644
--- a/src/test/java/org/apache/commons/validator/ShortTest.java
+++ b/src/test/java/org/apache/commons/validator/ShortTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
public class ShortTest extends AbstractNumberTest {
public ShortTest() {
- FORM_KEY = "shortForm";
- ACTION = "short";
+ formKey = "shortForm";
+ action = "short";
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java
b/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java
index 9074b474..ecc02447 100644
--- a/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java
+++ b/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java
@@ -34,9 +34,9 @@ import org.xml.sax.SAXException;
public class ValidatorResultsTest extends AbstractCommonTest {
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 static final String FIRST_NAME_FIELD = "firstName";
+ private static final String MIDDLE_NAME_FIELD = "middleName";
+ private static final String LAST_NAME_FIELD = "lastName";
private String firstName;
private String middleName;
@@ -106,12 +106,12 @@ public class ValidatorResultsTest extends
AbstractCommonTest {
final ValidatorResults results = validate(bean);
// Check results
- checkValidatorResult(results, firstNameField, "required", true);
- checkValidatorResult(results, middleNameField, "required", true);
- checkValidatorResult(results, middleNameField, "int", true);
- checkValidatorResult(results, middleNameField, "positive", true);
- checkValidatorResult(results, lastNameField, "required", true);
- checkValidatorResult(results, lastNameField, "int", true);
+ checkValidatorResult(results, FIRST_NAME_FIELD, "required", true);
+ checkValidatorResult(results, MIDDLE_NAME_FIELD, "required", true);
+ checkValidatorResult(results, MIDDLE_NAME_FIELD, "int", true);
+ checkValidatorResult(results, MIDDLE_NAME_FIELD, "positive", true);
+ checkValidatorResult(results, LAST_NAME_FIELD, "required", true);
+ checkValidatorResult(results, LAST_NAME_FIELD, "int", true);
}
@@ -131,12 +131,12 @@ public class ValidatorResultsTest extends
AbstractCommonTest {
final ValidatorResults results = validate(bean);
// Check results
- checkValidatorResult(results, firstNameField, "required", true);
- checkValidatorResult(results, middleNameField, "required", true);
- checkValidatorResult(results, middleNameField, "int", false);
- checkNotRun(results, middleNameField, "positive");
- checkValidatorResult(results, lastNameField, "required", false);
- checkNotRun(results, lastNameField, "int");
+ checkValidatorResult(results, FIRST_NAME_FIELD, "required", true);
+ checkValidatorResult(results, MIDDLE_NAME_FIELD, "required", true);
+ checkValidatorResult(results, MIDDLE_NAME_FIELD, "int", false);
+ checkNotRun(results, MIDDLE_NAME_FIELD, "positive");
+ checkValidatorResult(results, LAST_NAME_FIELD, "required", false);
+ checkNotRun(results, LAST_NAME_FIELD, "int");
}
diff --git a/src/test/java/org/apache/commons/validator/VarTest.java
b/src/test/java/org/apache/commons/validator/VarTest.java
index 85e50f61..9b1db321 100644
--- a/src/test/java/org/apache/commons/validator/VarTest.java
+++ b/src/test/java/org/apache/commons/validator/VarTest.java
@@ -38,12 +38,12 @@ public class VarTest extends AbstractCommonTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "testForm";
+ protected static final String FORM_KEY = "testForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "byte";
+ protected static final String ACTION = "byte";
/**
* Load <code>ValidatorResources</code> from validator-multipletest.xml.
diff --git
a/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
index 57a81506..2d4a61cb 100644
---
a/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
@@ -120,7 +120,7 @@ public class BigDecimalValidatorTest extends
AbstractNumberValidatorTest {
final String germanPatternVal = "1.23.45";
final String localeVal = "12.345";
final String defaultVal = "12,345";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final BigDecimal expected = new BigDecimal(12345);
assertEquals(expected,
BigDecimalValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected,
BigDecimalValidator.getInstance().validate(localeVal, locale), "validate(A)
locale ");
@@ -132,14 +132,14 @@ public class BigDecimalValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(BigDecimalValidator.getInstance().isValid(patternVal,
pattern), "isValid(A) pattern");
assertTrue(BigDecimalValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(BigDecimalValidator.getInstance().validate(XXXX),
"validate(B) default");
- assertNull(BigDecimalValidator.getInstance().validate(XXXX, locale),
"validate(B) locale");
- assertNull(BigDecimalValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(BigDecimalValidator.getInstance().validate(xxxx),
"validate(B) default");
+ assertNull(BigDecimalValidator.getInstance().validate(xxxx, locale),
"validate(B) locale");
+ assertNull(BigDecimalValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(BigDecimalValidator.getInstance().validate(patternVal,
pattern, Locale.GERMAN), "validate(B) both");
- assertFalse(BigDecimalValidator.getInstance().isValid(XXXX),
"isValid(B) default");
- assertFalse(BigDecimalValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale");
- assertFalse(BigDecimalValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(BigDecimalValidator.getInstance().isValid(xxxx),
"isValid(B) default");
+ assertFalse(BigDecimalValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale");
+ assertFalse(BigDecimalValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(BigDecimalValidator.getInstance().isValid(patternVal,
pattern, Locale.GERMAN), "isValid(B) both");
}
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
index 549d896e..99cdf589 100644
---
a/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
@@ -115,7 +115,7 @@ public class BigIntegerValidatorTest extends
AbstractNumberValidatorTest {
final String germanPatternVal = "1.23.45";
final String localeVal = "12.345";
final String defaultVal = "12,345";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final BigInteger expected = new BigInteger("12345");
assertEquals(expected,
BigIntegerValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected,
BigIntegerValidator.getInstance().validate(localeVal, locale), "validate(A)
locale ");
@@ -127,14 +127,14 @@ public class BigIntegerValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(BigIntegerValidator.getInstance().isValid(patternVal,
pattern), "isValid(A) pattern");
assertTrue(BigIntegerValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(BigIntegerValidator.getInstance().validate(XXXX),
"validate(B) default");
- assertNull(BigIntegerValidator.getInstance().validate(XXXX, locale),
"validate(B) locale ");
- assertNull(BigIntegerValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(BigIntegerValidator.getInstance().validate(xxxx),
"validate(B) default");
+ assertNull(BigIntegerValidator.getInstance().validate(xxxx, locale),
"validate(B) locale ");
+ assertNull(BigIntegerValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(BigIntegerValidator.getInstance().validate(patternVal,
pattern, Locale.GERMAN), "validate(B) both");
- assertFalse(BigIntegerValidator.getInstance().isValid(XXXX),
"isValid(B) default");
- assertFalse(BigIntegerValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale ");
- assertFalse(BigIntegerValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(BigIntegerValidator.getInstance().isValid(xxxx),
"isValid(B) default");
+ assertFalse(BigIntegerValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale ");
+ assertFalse(BigIntegerValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(BigIntegerValidator.getInstance().isValid(patternVal,
pattern, Locale.GERMAN), "isValid(B) both");
}
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
index 38104f4c..d3641f03 100644
--- a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
@@ -125,7 +125,7 @@ public class ByteValidatorTest extends
AbstractNumberValidatorTest {
final String germanPatternVal = "1.23";
final String localeVal = ".123";
final String defaultVal = ",123";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Byte expected = Byte.valueOf((byte) 123);
assertEquals(expected,
ByteValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected, ByteValidator.getInstance().validate(localeVal,
locale), "validate(A) locale ");
@@ -137,14 +137,14 @@ public class ByteValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(ByteValidator.getInstance().isValid(patternVal, pattern),
"isValid(A) pattern");
assertTrue(ByteValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(ByteValidator.getInstance().validate(XXXX), "validate(B)
default");
- assertNull(ByteValidator.getInstance().validate(XXXX, locale),
"validate(B) locale ");
- assertNull(ByteValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(ByteValidator.getInstance().validate(xxxx), "validate(B)
default");
+ assertNull(ByteValidator.getInstance().validate(xxxx, locale),
"validate(B) locale ");
+ assertNull(ByteValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(ByteValidator.getInstance().validate(patternVal, pattern,
Locale.GERMAN), "validate(B) both");
- assertFalse(ByteValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(ByteValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale ");
- assertFalse(ByteValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(ByteValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(ByteValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale ");
+ assertFalse(ByteValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(ByteValidator.getInstance().isValid(patternVal, pattern,
Locale.GERMAN), "isValid(B) both");
}
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
index 59521dee..e4ec0d32 100644
---
a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
@@ -109,7 +109,7 @@ public class CalendarValidatorTest extends
AbstractCalendarValidatorTest {
final String germanPattern = "dd MMM yyyy";
final String localeVal = "31.12.2005";
final String defaultVal = "12/31/05";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Date expected = createCalendar(null, 20051231, 0).getTime();
assertEquals(expected,
CalendarValidator.getInstance().validate(defaultVal).getTime(), "validate(A)
default");
assertEquals(expected,
CalendarValidator.getInstance().validate(localeVal, locale).getTime(),
"validate(A) locale ");
@@ -121,14 +121,14 @@ public class CalendarValidatorTest extends
AbstractCalendarValidatorTest {
assertTrue(CalendarValidator.getInstance().isValid(patternVal,
pattern), "isValid(A) pattern");
assertTrue(CalendarValidator.getInstance().isValid(germanVal,
germanPattern, Locale.GERMAN), "isValid(A) both");
- assertNull(CalendarValidator.getInstance().validate(XXXX),
"validate(B) default");
- assertNull(CalendarValidator.getInstance().validate(XXXX, locale),
"validate(B) locale ");
- assertNull(CalendarValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(CalendarValidator.getInstance().validate(xxxx),
"validate(B) default");
+ assertNull(CalendarValidator.getInstance().validate(xxxx, locale),
"validate(B) locale ");
+ assertNull(CalendarValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(CalendarValidator.getInstance().validate("31 Dec 2005",
germanPattern, Locale.GERMAN), "validate(B) both");
- assertFalse(CalendarValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(CalendarValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale ");
- assertFalse(CalendarValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(CalendarValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(CalendarValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale ");
+ assertFalse(CalendarValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(CalendarValidator.getInstance().isValid("31 Dec 2005",
germanPattern, Locale.GERMAN), "isValid(B) both");
// Test Time Zone
diff --git
a/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
index 5e35bdaa..576d05a0 100644
--- a/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
@@ -115,59 +115,59 @@ public class CodeValidatorTest {
@Test
public void testLength() {
CodeValidator validator = new CodeValidator((String) null, -1, -1,
(CheckDigit) null);
- final String length_10 = "1234567890";
- final String length_11 = "12345678901";
- final String length_12 = "123456789012";
- final String length_20 = "12345678901234567890";
- final String length_21 = "123456789012345678901";
- final String length_22 = "1234567890123456789012";
+ final String length10 = "1234567890";
+ final String length11 = "12345678901";
+ final String length12 = "123456789012";
+ final String length20 = "12345678901234567890";
+ final String length21 = "123456789012345678901";
+ final String length22 = "1234567890123456789012";
assertEquals(-1, validator.getMinLength(), "No min");
assertEquals(-1, validator.getMaxLength(), "No max");
- assertEquals(length_10, validator.validate(length_10), "No Length 10");
- assertEquals(length_11, validator.validate(length_11), "No Length 11");
- assertEquals(length_12, validator.validate(length_12), "No Length 12");
- assertEquals(length_20, validator.validate(length_20), "No Length 20");
- assertEquals(length_21, validator.validate(length_21), "No Length 21");
- assertEquals(length_22, validator.validate(length_22), "No Length 22");
+ assertEquals(length10, validator.validate(length10), "No Length 10");
+ assertEquals(length11, validator.validate(length11), "No Length 11");
+ assertEquals(length12, validator.validate(length12), "No Length 12");
+ assertEquals(length20, validator.validate(length20), "No Length 20");
+ assertEquals(length21, validator.validate(length21), "No Length 21");
+ assertEquals(length22, validator.validate(length22), "No Length 22");
validator = new CodeValidator((String) null, 11, -1, (CheckDigit)
null);
assertEquals(11, validator.getMinLength(), "Min 11 - min");
assertEquals(-1, validator.getMaxLength(), "Min 11 - max");
- assertNull(validator.validate(length_10), "Min 11 - 10");
- assertEquals(length_11, validator.validate(length_11), "Min 11 - 11");
- assertEquals(length_12, validator.validate(length_12), "Min 11 - 12");
- assertEquals(length_20, validator.validate(length_20), "Min 11 - 20");
- assertEquals(length_21, validator.validate(length_21), "Min 11 - 21");
- assertEquals(length_22, validator.validate(length_22), "Min 11 - 22");
+ assertNull(validator.validate(length10), "Min 11 - 10");
+ assertEquals(length11, validator.validate(length11), "Min 11 - 11");
+ assertEquals(length12, validator.validate(length12), "Min 11 - 12");
+ assertEquals(length20, validator.validate(length20), "Min 11 - 20");
+ assertEquals(length21, validator.validate(length21), "Min 11 - 21");
+ assertEquals(length22, validator.validate(length22), "Min 11 - 22");
validator = new CodeValidator((String) null, -1, 21, (CheckDigit)
null);
assertEquals(-1, validator.getMinLength(), "Max 21 - min");
assertEquals(21, validator.getMaxLength(), "Max 21 - max");
- assertEquals(length_10, validator.validate(length_10), "Max 21 - 10");
- assertEquals(length_11, validator.validate(length_11), "Max 21 - 11");
- assertEquals(length_12, validator.validate(length_12), "Max 21 - 12");
- assertEquals(length_20, validator.validate(length_20), "Max 21 - 20");
- assertEquals(length_21, validator.validate(length_21), "Max 21 - 21");
- assertNull(validator.validate(length_22), "Max 21 - 22");
+ assertEquals(length10, validator.validate(length10), "Max 21 - 10");
+ assertEquals(length11, validator.validate(length11), "Max 21 - 11");
+ assertEquals(length12, validator.validate(length12), "Max 21 - 12");
+ assertEquals(length20, validator.validate(length20), "Max 21 - 20");
+ assertEquals(length21, validator.validate(length21), "Max 21 - 21");
+ assertNull(validator.validate(length22), "Max 21 - 22");
validator = new CodeValidator((String) null, 11, 21, (CheckDigit)
null);
assertEquals(11, validator.getMinLength(), "Min 11 / Max 21 - min");
assertEquals(21, validator.getMaxLength(), "Min 11 / Max 21 - max");
- assertNull(validator.validate(length_10), "Min 11 / Max 21 - 10");
- assertEquals(length_11, validator.validate(length_11), "Min 11 / Max
21 - 11");
- assertEquals(length_12, validator.validate(length_12), "Min 11 / Max
21 - 12");
- assertEquals(length_20, validator.validate(length_20), "Min 11 / Max
21 - 20");
- assertEquals(length_21, validator.validate(length_21), "Min 11 / Max
21 - 21");
- assertNull(validator.validate(length_22), "Min 11 / Max 21 - 22");
+ assertNull(validator.validate(length10), "Min 11 / Max 21 - 10");
+ assertEquals(length11, validator.validate(length11), "Min 11 / Max 21
- 11");
+ assertEquals(length12, validator.validate(length12), "Min 11 / Max 21
- 12");
+ assertEquals(length20, validator.validate(length20), "Min 11 / Max 21
- 20");
+ assertEquals(length21, validator.validate(length21), "Min 11 / Max 21
- 21");
+ assertNull(validator.validate(length22), "Min 11 / Max 21 - 22");
validator = new CodeValidator((String) null, 11, 11, (CheckDigit)
null);
assertEquals(11, validator.getMinLength(), "Exact 11 - min");
assertEquals(11, validator.getMaxLength(), "Exact 11 - max");
- assertNull(validator.validate(length_10), "Exact 11 - 10");
- assertEquals(length_11, validator.validate(length_11), "Exact 11 -
11");
- assertNull(validator.validate(length_12), "Exact 11 - 12");
+ assertNull(validator.validate(length10), "Exact 11 - 10");
+ assertEquals(length11, validator.validate(length11), "Exact 11 - 11");
+ assertNull(validator.validate(length12), "Exact 11 - 12");
}
/**
@@ -231,7 +231,7 @@ public class CodeValidatorTest {
}
@Test
- public void testValidator294_1() {
+ public void testValidator294Part1() {
CodeValidator validator = new CodeValidator((String) null, 0, -1,
(CheckDigit) null);
assertNull(validator.validate(null), "Null");
validator = new CodeValidator((String) null, -1, 0, (CheckDigit) null);
@@ -239,7 +239,7 @@ public class CodeValidatorTest {
}
@Test
- public void testValidator294_2() {
+ public void testValidator294Part2() {
final CodeValidator validator = new CodeValidator((String) null, -1,
0, (CheckDigit) null);
assertNull(validator.validate(null), "Null");
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
index 97380a4e..20cd45d4 100644
---
a/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
@@ -407,8 +407,8 @@ public class CreditCardValidatorTest {
@Test
public void testMastercardUsingSeparators() {
- final String MASTERCARD_REGEX_SEP = "^(5[1-5]\\d{2})(?:[-
])?(\\d{4})(?:[- ])?(\\d{4})(?:[- ])?(\\d{4})$";
- final CodeValidator validator = new
CodeValidator(MASTERCARD_REGEX_SEP, LuhnCheckDigit.LUHN_CHECK_DIGIT);
+ final String masterCardRegExSep = "^(5[1-5]\\d{2})(?:[-
])?(\\d{4})(?:[- ])?(\\d{4})(?:[- ])?(\\d{4})$";
+ final CodeValidator validator = new CodeValidator(masterCardRegExSep,
LuhnCheckDigit.LUHN_CHECK_DIGIT);
final RegexValidator regex = validator.getRegexValidator();
// ****** Test Regular Expression ******
@@ -481,13 +481,13 @@ public class CreditCardValidatorTest {
assertTrue(validator.isValid("5555555555554444"), "Valid-E");
final RegexValidator rev = validator.getRegexValidator();
- final String PAD = "0000000000";
- assertFalse(rev.isValid("222099" + PAD), "222099");
+ final String pad = "0000000000";
+ assertFalse(rev.isValid("222099" + pad), "222099");
for (int i = 222100; i <= 272099; i++) {
- final String j = Integer.toString(i) + PAD;
+ final String j = Integer.toString(i) + pad;
assertTrue(rev.isValid(j), j);
}
- assertFalse(rev.isValid("272100" + PAD), "272100");
+ assertFalse(rev.isValid("272100" + pad), "272100");
}
@Test
diff --git
a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
index 527fa364..942f3999 100644
---
a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
@@ -34,13 +34,13 @@ public class CurrencyValidatorTest {
private static final char CURRENCY_SYMBOL = '\u00A4';
- private String US_DOLLAR;
- private String UK_POUND;
+ private String usDollar;
+ private String ukPound;
@BeforeEach
protected void setUp() {
- US_DOLLAR = new DecimalFormatSymbols(Locale.US).getCurrencySymbol();
- UK_POUND = new DecimalFormatSymbols(Locale.UK).getCurrencySymbol();
+ usDollar = new DecimalFormatSymbols(Locale.US).getCurrencySymbol();
+ ukPound = new DecimalFormatSymbols(Locale.UK).getCurrencySymbol();
}
/**
@@ -60,12 +60,12 @@ public class CurrencyValidatorTest {
final CurrencyValidator validator = new CurrencyValidator(true, false);
// Invalid UK - has decimals
- assertFalse(validator.isValid(UK_POUND + "1,234.56", Locale.UK), "UK
positive");
- assertFalse(validator.isValid("-" + UK_POUND + "1,234.56", Locale.UK),
"UK negative");
+ assertFalse(validator.isValid(ukPound + "1,234.56", Locale.UK), "UK
positive");
+ assertFalse(validator.isValid("-" + ukPound + "1,234.56", Locale.UK),
"UK negative");
// Invalid US - has decimals
- assertFalse(validator.isValid(US_DOLLAR + "1,234.56", Locale.US), "US
positive");
- assertFalse(validator.isValid("(" + US_DOLLAR + "1,234.56)",
Locale.US), "US negative");
+ assertFalse(validator.isValid(usDollar + "1,234.56", Locale.US), "US
positive");
+ assertFalse(validator.isValid("(" + usDollar + "1,234.56)",
Locale.US), "US negative");
}
/**
@@ -81,13 +81,13 @@ public class CurrencyValidatorTest {
final BigDecimal expected = new BigDecimal("1234.00");
final BigDecimal negative = new BigDecimal("-1234.00");
- assertEquals(expected, validator.validate(UK_POUND + "1,234"),
"Default locale");
+ assertEquals(expected, validator.validate(ukPound + "1,234"), "Default
locale");
- assertEquals(expected, validator.validate(UK_POUND + "1,234",
Locale.UK), "UK locale");
- assertEquals(negative, validator.validate("-" + UK_POUND + "1,234",
Locale.UK), "UK negative");
+ assertEquals(expected, validator.validate(ukPound + "1,234",
Locale.UK), "UK locale");
+ assertEquals(negative, validator.validate("-" + ukPound + "1,234",
Locale.UK), "UK negative");
- assertEquals(expected, validator.validate(US_DOLLAR + "1,234",
Locale.US), "US locale");
- assertEquals(negative, validator.validate("(" + US_DOLLAR + "1,234)",
Locale.US), "US negative");
+ assertEquals(expected, validator.validate(usDollar + "1,234",
Locale.US), "US locale");
+ assertEquals(negative, validator.validate("(" + usDollar + "1,234)",
Locale.US), "US negative");
// Restore the original default
Locale.setDefault(origDefault);
@@ -107,12 +107,12 @@ public class CurrencyValidatorTest {
assertNull(validator.validate(""), "validate() Empty Value");
// Invalid UK
- assertFalse(validator.isValid(US_DOLLAR + "1,234.56", Locale.UK), "UK
wrong symbol");
- assertFalse(validator.isValid("(" + UK_POUND + "1,234.56)",
Locale.UK), "UK wrong negative");
+ assertFalse(validator.isValid(usDollar + "1,234.56", Locale.UK), "UK
wrong symbol");
+ assertFalse(validator.isValid("(" + ukPound + "1,234.56)", Locale.UK),
"UK wrong negative");
// Invalid US
- assertFalse(validator.isValid(UK_POUND + "1,234.56", Locale.US), "US
wrong symbol");
- assertFalse(validator.isValid("-" + US_DOLLAR + "1,234.56",
Locale.US), "US wrong negative");
+ assertFalse(validator.isValid(ukPound + "1,234.56", Locale.US), "US
wrong symbol");
+ assertFalse(validator.isValid("-" + usDollar + "1,234.56", Locale.US),
"US wrong negative");
}
/**
@@ -131,20 +131,20 @@ public class CurrencyValidatorTest {
final BigDecimal negative = new BigDecimal("-1234.567");
// Test Pattern
- assertEquals(expected, validator.validate(UK_POUND + "1,234.567",
pattern), "default");
- assertEquals(negative, validator.validate("[" + UK_POUND +
"1,234.567]", pattern), "negative");
+ assertEquals(expected, validator.validate(ukPound + "1,234.567",
pattern), "default");
+ assertEquals(negative, validator.validate("[" + ukPound +
"1,234.567]", pattern), "negative");
assertEquals(expected, validator.validate("1,234.567", pattern), "no
symbol +ve");
assertEquals(negative, validator.validate("[1,234.567]", pattern), "no
symbol -ve");
// Test Pattern & Locale
- assertEquals(expected, validator.validate(US_DOLLAR + "1,234.567",
pattern, Locale.US), "default");
- assertEquals(negative, validator.validate("[" + US_DOLLAR +
"1,234.567]", pattern, Locale.US), "negative");
+ assertEquals(expected, validator.validate(usDollar + "1,234.567",
pattern, Locale.US), "default");
+ assertEquals(negative, validator.validate("[" + usDollar +
"1,234.567]", pattern, Locale.US), "negative");
assertEquals(expected, validator.validate("1,234.567", pattern,
Locale.US), "no symbol +ve");
assertEquals(negative, validator.validate("[1,234.567]", pattern,
Locale.US), "no symbol -ve");
// invalid
- assertFalse(validator.isValid(US_DOLLAR + "1,234.567", pattern),
"invalid symbol");
- assertFalse(validator.isValid(UK_POUND + "1,234.567", pattern,
Locale.US), "invalid symbol");
+ assertFalse(validator.isValid(usDollar + "1,234.567", pattern),
"invalid symbol");
+ assertFalse(validator.isValid(ukPound + "1,234.567", pattern,
Locale.US), "invalid symbol");
// Restore the original default
Locale.setDefault(origDefault);
@@ -165,20 +165,20 @@ public class CurrencyValidatorTest {
final BigDecimal noDecimal = new BigDecimal("1234.00");
final BigDecimal oneDecimal = new BigDecimal("1234.50");
- assertEquals(expected, validator.validate(UK_POUND + "1,234.56"),
"Default locale");
+ assertEquals(expected, validator.validate(ukPound + "1,234.56"),
"Default locale");
- assertEquals(expected, validator.validate(UK_POUND + "1,234.56",
Locale.UK), "UK locale");
- assertEquals(negative, validator.validate("-" + UK_POUND + "1,234.56",
Locale.UK), "UK negative");
- assertEquals(noDecimal, validator.validate(UK_POUND + "1,234",
Locale.UK), "UK no decimal");
- assertEquals(oneDecimal, validator.validate(UK_POUND + "1,234.5",
Locale.UK), "UK 1 decimal");
- assertEquals(expected, validator.validate(UK_POUND + "1,234.567",
Locale.UK), "UK 3 decimal");
+ assertEquals(expected, validator.validate(ukPound + "1,234.56",
Locale.UK), "UK locale");
+ assertEquals(negative, validator.validate("-" + ukPound + "1,234.56",
Locale.UK), "UK negative");
+ assertEquals(noDecimal, validator.validate(ukPound + "1,234",
Locale.UK), "UK no decimal");
+ assertEquals(oneDecimal, validator.validate(ukPound + "1,234.5",
Locale.UK), "UK 1 decimal");
+ assertEquals(expected, validator.validate(ukPound + "1,234.567",
Locale.UK), "UK 3 decimal");
assertEquals(expected, validator.validate("1,234.56", Locale.UK), "UK
no symbol");
- assertEquals(expected, validator.validate(US_DOLLAR + "1,234.56",
Locale.US), "US locale");
- assertEquals(negative, validator.validate("(" + US_DOLLAR +
"1,234.56)", Locale.US), "US negative");
- assertEquals(noDecimal, validator.validate(US_DOLLAR + "1,234",
Locale.US), "US no decimal");
- assertEquals(oneDecimal, validator.validate(US_DOLLAR + "1,234.5",
Locale.US), "US 1 decimal");
- assertEquals(expected, validator.validate(US_DOLLAR + "1,234.567",
Locale.US), "US 3 decimal");
+ assertEquals(expected, validator.validate(usDollar + "1,234.56",
Locale.US), "US locale");
+ assertEquals(negative, validator.validate("(" + usDollar +
"1,234.56)", Locale.US), "US negative");
+ assertEquals(noDecimal, validator.validate(usDollar + "1,234",
Locale.US), "US no decimal");
+ assertEquals(oneDecimal, validator.validate(usDollar + "1,234.5",
Locale.US), "US 1 decimal");
+ assertEquals(expected, validator.validate(usDollar + "1,234.567",
Locale.US), "US 3 decimal");
assertEquals(expected, validator.validate("1,234.56", Locale.US), "US
no symbol");
// Restore the original default
diff --git
a/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
index c6214282..4e2fb41f 100644
--- a/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
@@ -134,7 +134,7 @@ public class DateValidatorTest extends
AbstractCalendarValidatorTest {
final String germanPattern = "dd MMM yyyy";
final String localeVal = "31.12.2005";
final String defaultVal = "12/31/05";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Date expected = createCalendar(null, 20051231, 0).getTime();
assertEquals(expected,
DateValidator.getInstance().validate(defaultVal), "validate(A) default");
@@ -147,14 +147,14 @@ public class DateValidatorTest extends
AbstractCalendarValidatorTest {
assertTrue(DateValidator.getInstance().isValid(patternVal, pattern),
"isValid(A) pattern");
assertTrue(DateValidator.getInstance().isValid(germanVal,
germanPattern, Locale.GERMAN), "isValid(A) both");
- assertNull(DateValidator.getInstance().validate(XXXX), "validate(B)
default");
- assertNull(DateValidator.getInstance().validate(XXXX, locale),
"validate(B) locale ");
- assertNull(DateValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(DateValidator.getInstance().validate(xxxx), "validate(B)
default");
+ assertNull(DateValidator.getInstance().validate(xxxx, locale),
"validate(B) locale ");
+ assertNull(DateValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(DateValidator.getInstance().validate("31 Dec 2005",
germanPattern, Locale.GERMAN), "validate(B) both");
- assertFalse(DateValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(DateValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale ");
- assertFalse(DateValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(DateValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(DateValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale ");
+ assertFalse(DateValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(DateValidator.getInstance().isValid("31 Dec 2005",
germanPattern, Locale.GERMAN), "isValid(B) both");
// Test Time Zone
diff --git
a/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
b/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
index 63b88c2c..351d466e 100644
---
a/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
@@ -196,7 +196,7 @@ public class DomainValidatorStartupTest {
}
@Test
- public void testVALIDATOR_412a() {
+ public void testValidator412a() {
final DomainValidator validator = DomainValidator.getInstance();
assertFalse(validator.isValidGenericTld("local"));
assertFalse(validator.isValid("abc.local"));
@@ -205,7 +205,7 @@ public class DomainValidatorStartupTest {
}
@Test
- public void testVALIDATOR_412b() {
+ public void testValidator412b() {
DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "local",
"pvt");
final DomainValidator validator = DomainValidator.getInstance();
assertTrue(validator.isValidGenericTld("local"));
@@ -215,7 +215,7 @@ public class DomainValidatorStartupTest {
}
@Test
- public void testVALIDATOR_412c() {
+ public void testValidator412c() {
final DomainValidator validator = DomainValidator.getInstance(true);
assertFalse(validator.isValidLocalTld("local"));
assertFalse(validator.isValid("abc.local"));
@@ -224,7 +224,7 @@ public class DomainValidatorStartupTest {
}
@Test
- public void testVALIDATOR_412d() {
+ public void testValidator412d() {
DomainValidator.updateTLDOverride(ArrayType.LOCAL_PLUS, "local",
"pvt");
final DomainValidator validator = DomainValidator.getInstance(true);
assertTrue(validator.isValidLocalTld("local"));
diff --git
a/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
index 6d8f2bb1..f8a6a7a3 100644
---
a/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
@@ -60,7 +60,8 @@ public class DomainValidatorTest {
if (in != null) {
try {
in.close();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
+ // ignore
}
}
}
@@ -70,12 +71,12 @@ public class DomainValidatorTest {
* check if it is newer than the txt file and skip download if so
*/
private static long download(final File file, final String tldUrl, final
long timestamp) throws IOException {
- final int HOUR = 60 * 60 * 1000; // an hour in ms
+ final int hour = 60 * 60 * 1000; // an hour in ms
final long modTime;
// For testing purposes, don't download files more than once an hour
if (file.canRead()) {
modTime = file.lastModified();
- if (modTime > System.currentTimeMillis() - HOUR) {
+ if (modTime > System.currentTimeMillis() - hour) {
System.out.println("Skipping download - found recent " + file);
return modTime;
}
@@ -211,7 +212,8 @@ public class DomainValidatorTest {
}
}
in.close();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
+ // ignore
} finally {
closeQuietly(in);
}
@@ -265,11 +267,11 @@ public class DomainValidatorTest {
public static void main(final String a[]) throws Exception {
// Check the arrays first as this affects later checks
// Doing this here makes it easier when updating the lists
- boolean OK = true;
+ boolean ok = true;
for (final String list : new String[] { "INFRASTRUCTURE_TLDS",
"COUNTRY_CODE_TLDS", "GENERIC_TLDS", "LOCAL_TLDS" }) {
- OK &= isSortedLowerCase(list);
+ ok &= isSortedLowerCase(list);
}
- if (!OK) {
+ if (!ok) {
System.out.println("Fix arrays before retrying; cannot continue");
return;
}
@@ -378,28 +380,28 @@ public class DomainValidatorTest {
// Check array is sorted and is lower-case
@Test
- public void test_COUNTRY_CODE_TLDS_sortedAndLowerCase() throws Exception {
+ public void testCountryCodeTldsSortedAndLowerCase() throws Exception {
final boolean sorted = isSortedLowerCase("COUNTRY_CODE_TLDS");
assertTrue(sorted);
}
// Check array is sorted and is lower-case
@Test
- public void test_GENERIC_TLDS_sortedAndLowerCase() throws Exception {
+ public void testGenericTldsSortedAndLowerCase() throws Exception {
final boolean sorted = isSortedLowerCase("GENERIC_TLDS");
assertTrue(sorted);
}
// Check array is sorted and is lower-case
@Test
- public void test_INFRASTRUCTURE_TLDS_sortedAndLowerCase() throws Exception
{
+ public void testInfrastructureTldsSortedAndLowerCase() throws Exception {
final boolean sorted = isSortedLowerCase("INFRASTRUCTURE_TLDS");
assertTrue(sorted);
}
// Check array is sorted and is lower-case
@Test
- public void test_LOCAL_TLDS_sortedAndLowerCase() throws Exception {
+ public void tesLocalTldsSortedAndLowerCase() throws Exception {
final boolean sorted = isSortedLowerCase("LOCAL_TLDS");
assertTrue(sorted);
}
@@ -428,7 +430,7 @@ public class DomainValidatorTest {
}
@Test
- public void testDomainNoDots() {// rfc1123
+ public void testDomainNoDots() { // rfc1123
assertTrue(validator.isValidDomainSyntax("a"), "a (alpha) should
validate");
assertTrue(validator.isValidDomainSyntax("9"), "9 (alphanum) should
validate");
assertTrue(validator.isValidDomainSyntax("c-z"), "c-z (alpha - alpha)
should validate");
diff --git
a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
index c055bd96..26119eca 100644
---
a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
@@ -114,7 +114,7 @@ public class DoubleValidatorTest extends
AbstractNumberValidatorTest {
final String germanPatternVal = "1.23.45";
final String localeVal = "12.345";
final String defaultVal = "12,345";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Double expected = Double.valueOf(12345);
assertEquals(expected,
DoubleValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected,
DoubleValidator.getInstance().validate(localeVal, locale), "validate(A)
locale");
@@ -126,14 +126,14 @@ public class DoubleValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(DoubleValidator.getInstance().isValid(patternVal, pattern),
"isValid(A) pattern");
assertTrue(DoubleValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(DoubleValidator.getInstance().validate(XXXX), "validate(B)
default");
- assertNull(DoubleValidator.getInstance().validate(XXXX, locale),
"validate(B) locale ");
- assertNull(DoubleValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(DoubleValidator.getInstance().validate(xxxx), "validate(B)
default");
+ assertNull(DoubleValidator.getInstance().validate(xxxx, locale),
"validate(B) locale ");
+ assertNull(DoubleValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(DoubleValidator.getInstance().validate(patternVal, pattern,
Locale.GERMAN), "validate(B) both");
- assertFalse(DoubleValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(DoubleValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale");
- assertFalse(DoubleValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(DoubleValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(DoubleValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale");
+ assertFalse(DoubleValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(DoubleValidator.getInstance().isValid(patternVal, pattern,
Locale.GERMAN), "isValid(B) both");
}
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
index 36c9d47f..e1bf4fdc 100644
---
a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
@@ -41,18 +41,18 @@ public class EmailValidatorTest {
/**
* The key used to retrieve the set of validation rules from the xml file.
*/
- protected static String FORM_KEY = "emailForm";
+ protected static final String FORM_KEY = "emailForm";
/**
* The key used to retrieve the validator action.
*/
- protected static String ACTION = "email";
+ protected static final String ACTION = "email";
/**
* These test values derive directly from RFC 822 & Mail::RFC822::Address
& RFC::RFC822::Address perl test.pl For traceability don't combine these test
* values with other tests.
*/
- private static final ResultPair[] testEmailFromPerl = {
+ private static final ResultPair[] TEST_EMAIL_FROM_PERL = {
// @formatter:off
new ResultPair("[email protected]", true),
new ResultPair("[email protected] ", true),
@@ -190,7 +190,7 @@ public class EmailValidatorTest {
@Test
public void testEmailFromPerl() {
int errors = 0;
- for (final ResultPair element : testEmailFromPerl) {
+ for (final ResultPair element : TEST_EMAIL_FROM_PERL) {
final String item = element.item;
final boolean exp = element.valid;
final boolean act = validator.isValid(item);
@@ -472,13 +472,13 @@ public class EmailValidatorTest {
}
@Test
- public void testVALIDATOR_278() {
+ public void testValidator278() {
assertFalse(validator.isValid("[email protected]")); // hostname
starts with dash/hyphen
assertFalse(validator.isValid("[email protected]")); // hostname ends
with dash/hyphen
}
@Test
- public void testVALIDATOR_315() {
+ public void testValidator315() {
assertFalse(validator.isValid("me@at&t.net"));
assertTrue(validator.isValid("[email protected]")); // Make sure TLD is not
the cause of the failure
}
@@ -546,13 +546,13 @@ public class EmailValidatorTest {
}
@Test
- public void testValidator473_1() { // reject null DomainValidator
+ public void testValidator473Part1() { // reject null DomainValidator
final IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> new EmailValidator(false,
false, null));
assertThat(thrown.getMessage(), is(equalTo("DomainValidator cannot be
null")));
}
@Test
- public void testValidator473_2() { // reject null DomainValidator with
mismatched allowLocal
+ public void testValidator473Part2() { // reject null DomainValidator with
mismatched allowLocal
final List<DomainValidator.Item> items = new ArrayList<>();
final IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class,
() -> new EmailValidator(false, false,
DomainValidator.getInstance(true, items)));
@@ -560,7 +560,7 @@ public class EmailValidatorTest {
}
@Test
- public void testValidator473_3() { // reject null DomainValidator with
mismatched allowLocal
+ public void testValidator473Part3() { // reject null DomainValidator with
mismatched allowLocal
final List<DomainValidator.Item> items = new ArrayList<>();
final IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class,
() -> new EmailValidator(true, false,
DomainValidator.getInstance(false, items)));
@@ -568,7 +568,7 @@ public class EmailValidatorTest {
}
@Test
- public void testValidator473_4() { // Show that can override domain
validation
+ public void testValidator473Part4() { // Show that can override domain
validation
assertFalse(validator.isValidDomain("test.local"));
final List<DomainValidator.Item> items = new ArrayList<>();
items.add(new
DomainValidator.Item(DomainValidator.ArrayType.GENERIC_PLUS, "local"));
diff --git
a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
index 3274b60a..3b179ec7 100644
---
a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
@@ -144,7 +144,7 @@ public class FloatValidatorTest extends
AbstractNumberValidatorTest {
final String localeVal = "12.345";
final String germanPatternVal = "1.23.45";
final String defaultVal = "12,345";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Float expected = Float.valueOf(12345);
assertEquals(expected,
FloatValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected,
FloatValidator.getInstance().validate(localeVal, locale), "validate(A) locale");
@@ -156,14 +156,14 @@ public class FloatValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(FloatValidator.getInstance().isValid(patternVal, pattern),
"isValid(A) pattern");
assertTrue(FloatValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(FloatValidator.getInstance().validate(XXXX), "validate(B)
default");
- assertNull(FloatValidator.getInstance().validate(XXXX, locale),
"validate(B) locale ");
- assertNull(FloatValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(FloatValidator.getInstance().validate(xxxx), "validate(B)
default");
+ assertNull(FloatValidator.getInstance().validate(xxxx, locale),
"validate(B) locale ");
+ assertNull(FloatValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(FloatValidator.getInstance().validate(patternVal, pattern,
Locale.GERMAN), "validate(B) both");
- assertFalse(FloatValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(FloatValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale");
- assertFalse(FloatValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(FloatValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(FloatValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale");
+ assertFalse(FloatValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(FloatValidator.getInstance().isValid(patternVal, pattern,
Locale.GERMAN), "isValid(B) both");
}
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
index 3e823fe7..29906333 100644
--- a/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
@@ -254,10 +254,10 @@ public class IBANValidatorTest {
}
}
- private static String fmtRE(final String iban_pat, final int iban_len) {
- final Matcher m = IBAN_PAT.matcher(iban_pat);
+ private static String fmtRE(final String ibanPat, final int ibanLen) {
+ final Matcher m = IBAN_PAT.matcher(ibanPat);
if (!m.matches()) {
- throw new IllegalArgumentException("Unexpected IBAN pattern " +
iban_pat);
+ throw new IllegalArgumentException("Unexpected IBAN pattern " +
ibanPat);
}
final StringBuilder sb = new StringBuilder();
final String cc = m.group(1); // country code
@@ -282,8 +282,8 @@ public class IBANValidatorTest {
}
sb.append(formatToRE(curType, len));
totalLen += len;
- if (iban_len != totalLen) {
- throw new IllegalArgumentException("IBAN pattern " + iban_pat + "
does not match length " + iban_len);
+ if (ibanLen != totalLen) {
+ throw new IllegalArgumentException("IBAN pattern " + ibanPat + "
does not match length " + ibanLen);
}
return sb.toString();
}
@@ -305,12 +305,12 @@ public class IBANValidatorTest {
public static void main(final String[] a) throws Exception {
final IBANValidator validator = new IBANValidator();
- final File iban_tsv = new File("target", "iban-registry.tsv");
+ final File ibanTsv = new File("target", "iban-registry.tsv");
int countries = 0;
- if (iban_tsv.canRead()) {
- countries = checkIBAN(iban_tsv, validator);
+ if (ibanTsv.canRead()) {
+ countries = checkIBAN(ibanTsv, validator);
} else {
- System.out.println("Please load the file " +
iban_tsv.getCanonicalPath() + " from
https://www.swift.com/standards/data-standards/iban";);
+ System.out.println("Please load the file " +
ibanTsv.getCanonicalPath() + " from
https://www.swift.com/standards/data-standards/iban";);
}
System.out.println("Processed " + countries + " countries.");
}
@@ -369,7 +369,7 @@ public class IBANValidatorTest {
}
@Test
- public void testSetValidatorLen_1() {
+ public void testSetValidatorLen1() {
final IBANValidator validator = new IBANValidator();
assertNotNull(validator.setValidator("GB", -1, ""), "should be
present");
assertNull(validator.setValidator("GB", -1, ""), "no longer present");
diff --git
a/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
index a0872d4e..ef3bd000 100644
--- a/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ISSNValidatorTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.validator.routines;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -36,10 +37,10 @@ public class ISSNValidatorTest {
private static final ISSNValidator VALIDATOR = ISSNValidator.getInstance();
- private final String[] validFormat = { "ISSN 0317-8471", "1050-124X",
"ISSN 1562-6865", "1063-7710", "1748-7188", "ISSN 0264-2875", "1750-0095",
+ private static final String[] VALID_FORMAT = { "ISSN 0317-8471",
"1050-124X", "ISSN 1562-6865", "1063-7710", "1748-7188", "ISSN 0264-2875",
"1750-0095",
"1188-1534", "1911-1479", "ISSN 1911-1460", "0001-6772",
"1365-201X", "0264-3596", "1144-875X", };
- private final String[] invalidFormat = { "", // empty
+ private static final String[] INVALID_FORMAT = { "", // empty
" ", // empty
"ISBN 0317-8471", // wrong prefix
"'1050-124X", // leading garbage
@@ -86,7 +87,7 @@ public class ISSNValidatorTest {
*/
@Test
public void testInvalid() {
- for (final String f : invalidFormat) {
+ for (final String f : INVALID_FORMAT) {
assertFalse(VALIDATOR.isValid(f), f);
}
}
@@ -107,7 +108,7 @@ public class ISSNValidatorTest {
*/
@Test
public void testIsValidISSN() {
- for (final String f : validFormat) {
+ for (final String f : VALID_FORMAT) {
assertTrue(VALIDATOR.isValid(f), f);
}
}
@@ -119,7 +120,7 @@ public class ISSNValidatorTest {
public void testIsValidISSNConvert() {
final CheckDigit ean13cd = EAN13CheckDigit.EAN13_CHECK_DIGIT;
final Random r = new Random();
- for (final String f : validFormat) {
+ for (final String f : VALID_FORMAT) {
final String suffix = String.format("%02d", r.nextInt(100));
final String ean13 = VALIDATOR.convertToEAN13(f, suffix);
assertTrue(ean13cd.isValid(ean13), ean13);
@@ -137,42 +138,12 @@ public class ISSNValidatorTest {
@Test
public void testIsValidISSNConvertSuffix() {
- try {
- assertNull(VALIDATOR.convertToEAN13(null, null));
- fail("Expected IllegalArgumentException");
- } catch (final IllegalArgumentException expected) {
-
- }
- try {
- assertNull(VALIDATOR.convertToEAN13(null, ""));
- fail("Expected IllegalArgumentException");
- } catch (final IllegalArgumentException expected) {
-
- }
- try {
- assertNull(VALIDATOR.convertToEAN13(null, "0"));
- fail("Expected IllegalArgumentException");
- } catch (final IllegalArgumentException expected) {
-
- }
- try {
- assertNull(VALIDATOR.convertToEAN13(null, "A"));
- fail("Expected IllegalArgumentException");
- } catch (final IllegalArgumentException expected) {
-
- }
- try {
- assertNull(VALIDATOR.convertToEAN13(null, "AA"));
- fail("Expected IllegalArgumentException");
- } catch (final IllegalArgumentException expected) {
-
- }
- try {
- assertNull(VALIDATOR.convertToEAN13(null, "999"));
- fail("Expected IllegalArgumentException");
- } catch (final IllegalArgumentException expected) {
-
- }
+ assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.convertToEAN13(null, null));
+ assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.convertToEAN13(null, ""));
+ assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.convertToEAN13(null, "0"));
+ assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.convertToEAN13(null, "A"));
+ assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.convertToEAN13(null, "AA"));
+ assertThrows(IllegalArgumentException.class, () ->
VALIDATOR.convertToEAN13(null, "999"));
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java
index 35741fff..2ea7b33e 100644
---
a/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java
@@ -634,12 +634,12 @@ public class InetAddressValidatorTest {
}
@Test
- public void testVALIDATOR_335() {
+ public void testValidator335() {
assertTrue(validator.isValid("2001:0438:FFFE:0000:0000:0000:0000:0A35"),
"2001:0438:FFFE:0000:0000:0000:0000:0A35 should be valid");
}
@Test
- public void testVALIDATOR_419() {
+ public void testValidator419() {
String addr;
addr = "0:0:0:0:0:0:13.1.68.3";
assertTrue(validator.isValid(addr));
@@ -660,7 +660,7 @@ public class InetAddressValidatorTest {
* Inet6Address may also contain a scope id
*/
@Test
- public void testVALIDATOR_445() {
+ public void testValidator445() {
final String[] valid = { "2001:0000:1234:0000:0000:C1C0:ABCD:0876",
"2001:0000:1234:0000:0000:C1C0:ABCD:0876/123",
"2001:0000:1234:0000:0000:C1C0:ABCD:0876/0",
"2001:0000:1234:0000:0000:C1C0:ABCD:0876%0",
"2001:0000:1234:0000:0000:C1C0:ABCD:0876%abcdefgh", };
final String[] invalid = {
"2001:0000:1234:0000:0000:C1C0:ABCD:0876/129", // too big
diff --git
a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
index ac61128e..afd172a7 100644
---
a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
@@ -122,7 +122,7 @@ public class IntegerValidatorTest extends
AbstractNumberValidatorTest {
final String germanPatternVal = "1.23.45";
final String localeVal = "12.345";
final String defaultVal = "12,345";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Integer expected = Integer.valueOf(12345);
assertEquals(expected,
IntegerValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected,
IntegerValidator.getInstance().validate(localeVal, locale), "validate(A)
locale");
@@ -134,14 +134,14 @@ public class IntegerValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(IntegerValidator.getInstance().isValid(patternVal,
pattern), "isValid(A) pattern");
assertTrue(IntegerValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(IntegerValidator.getInstance().validate(XXXX), "validate(B)
default");
- assertNull(IntegerValidator.getInstance().validate(XXXX, locale),
"validate(B) locale");
- assertNull(IntegerValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(IntegerValidator.getInstance().validate(xxxx), "validate(B)
default");
+ assertNull(IntegerValidator.getInstance().validate(xxxx, locale),
"validate(B) locale");
+ assertNull(IntegerValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(IntegerValidator.getInstance().validate(patternVal,
pattern, Locale.GERMAN), "validate(B) both");
- assertFalse(IntegerValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(IntegerValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale");
- assertFalse(IntegerValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(IntegerValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(IntegerValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale");
+ assertFalse(IntegerValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(IntegerValidator.getInstance().isValid(patternVal,
pattern, Locale.GERMAN), "isValid(B) both");
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
index 1b2ec24f..7a32250f 100644
--- a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
@@ -125,7 +125,7 @@ public class LongValidatorTest extends
AbstractNumberValidatorTest {
final String germanPatternVal = "1.23.45";
final String localeVal = "12.345";
final String defaultVal = "12,345";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Long expected = Long.valueOf(12345);
assertEquals(expected,
LongValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected, LongValidator.getInstance().validate(localeVal,
locale), "validate(A) locale");
@@ -137,14 +137,14 @@ public class LongValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(LongValidator.getInstance().isValid(patternVal, pattern),
"isValid(A) pattern");
assertTrue(LongValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(LongValidator.getInstance().validate(XXXX), "validate(B)
default");
- assertNull(LongValidator.getInstance().validate(XXXX, locale),
"validate(B) locale");
- assertNull(LongValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(LongValidator.getInstance().validate(xxxx), "validate(B)
default");
+ assertNull(LongValidator.getInstance().validate(xxxx, locale),
"validate(B) locale");
+ assertNull(LongValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(LongValidator.getInstance().validate(patternVal, pattern,
Locale.GERMAN), "validate(B) both");
- assertFalse(LongValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(LongValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale");
- assertFalse(LongValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(LongValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(LongValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale");
+ assertFalse(LongValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(LongValidator.getInstance().isValid(patternVal, pattern,
Locale.GERMAN), "isValid(B) both");
}
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
index 393d1930..5658bbb0 100644
---
a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
@@ -116,7 +116,7 @@ public class ShortValidatorTest extends
AbstractNumberValidatorTest {
final String germanPatternVal = "1.23.45";
final String localeVal = "12.345";
final String defaultVal = "12,345";
- final String XXXX = "XXXX";
+ final String xxxx = "XXXX";
final Short expected = Short.valueOf((short) 12345);
assertEquals(expected,
ShortValidator.getInstance().validate(defaultVal), "validate(A) default");
assertEquals(expected,
ShortValidator.getInstance().validate(localeVal, locale), "validate(A) locale");
@@ -128,14 +128,14 @@ public class ShortValidatorTest extends
AbstractNumberValidatorTest {
assertTrue(ShortValidator.getInstance().isValid(patternVal, pattern),
"isValid(A) pattern");
assertTrue(ShortValidator.getInstance().isValid(germanPatternVal,
pattern, Locale.GERMAN), "isValid(A) both");
- assertNull(ShortValidator.getInstance().validate(XXXX), "validate(B)
default");
- assertNull(ShortValidator.getInstance().validate(XXXX, locale),
"validate(B) locale");
- assertNull(ShortValidator.getInstance().validate(XXXX, pattern),
"validate(B) pattern");
+ assertNull(ShortValidator.getInstance().validate(xxxx), "validate(B)
default");
+ assertNull(ShortValidator.getInstance().validate(xxxx, locale),
"validate(B) locale");
+ assertNull(ShortValidator.getInstance().validate(xxxx, pattern),
"validate(B) pattern");
assertNull(ShortValidator.getInstance().validate(patternVal, pattern,
Locale.GERMAN), "validate(B) both");
- assertFalse(ShortValidator.getInstance().isValid(XXXX), "isValid(B)
default");
- assertFalse(ShortValidator.getInstance().isValid(XXXX, locale),
"isValid(B) locale");
- assertFalse(ShortValidator.getInstance().isValid(XXXX, pattern),
"isValid(B) pattern");
+ assertFalse(ShortValidator.getInstance().isValid(xxxx), "isValid(B)
default");
+ assertFalse(ShortValidator.getInstance().isValid(xxxx, locale),
"isValid(B) locale");
+ assertFalse(ShortValidator.getInstance().isValid(xxxx, pattern),
"isValid(B) pattern");
assertFalse(ShortValidator.getInstance().isValid(patternVal, pattern,
Locale.GERMAN), "isValid(B) both");
}
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
index c3350ee2..f4171446 100644
--- a/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
@@ -613,13 +613,13 @@ public class UrlValidatorTest {
}
@Test
- public void testValidator473_1() { // reject null DomainValidator
+ public void testValidator473Part1() { // reject null DomainValidator
final IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> new UrlValidator(new
String[] {}, null, 0L, null));
assertThat(thrown.getMessage(), is(equalTo("DomainValidator must not
be null")));
}
@Test
- public void testValidator473_2() { // reject null DomainValidator with
mismatched allowLocal
+ public void testValidator473Part2() { // reject null DomainValidator with
mismatched allowLocal
final List<DomainValidator.Item> items = new ArrayList<>();
final IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class,
() -> new UrlValidator(new String[] {}, null, 0L,
DomainValidator.getInstance(true, items)));
@@ -627,7 +627,7 @@ public class UrlValidatorTest {
}
@Test
- public void testValidator473_3() { // reject null DomainValidator with
mismatched allowLocal
+ public void testValidator473Part3() { // reject null DomainValidator with
mismatched allowLocal
final List<DomainValidator.Item> items = new ArrayList<>();
final IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class,
() -> new UrlValidator(new String[] {}, null,
UrlValidator.ALLOW_LOCAL_URLS, DomainValidator.getInstance(false, items)));
diff --git
a/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java
b/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java
index 0ae32531..69136900 100644
---
a/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java
@@ -42,14 +42,14 @@ public class CUSIPCheckDigitTest extends
AbstractCheckDigitTest {
}
@Test
- public void testVALIDATOR_336_InvalidCheckDigits() {
+ public void testValidator336InvalidCheckDigits() {
for (final String invalidCheckDigit : INVALID_CHECK_DIGITS) {
assertFalse(routine.isValid(invalidCheckDigit), () -> "Should
fail: " + invalidCheckDigit);
}
}
@Test
- public void testVALIDATOR_336_ValidCheckDigits() {
+ public void testValidator336ValidCheckDigits() {
for (final String validCheckDigit : VALID_CHECK_DIGITS) {
assertTrue(routine.isValid(validCheckDigit), () -> "Should fail: "
+ validCheckDigit);
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java
b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java
index 90577b89..f84ec5ce 100644
---
a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java
@@ -52,7 +52,7 @@ public class ISINCheckDigitTest extends
AbstractCheckDigitTest {
}
@Test
- public void testVALIDATOR_345() {
+ public void testValidator345() {
for (final String invalidCheckDigit : INVALID_CHECK_DIGITS) {
assertFalse(routine.isValid(invalidCheckDigit), () -> "Should
fail: " + invalidCheckDigit);
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java
b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java
index 1240579c..1217ef90 100644
---
a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java
@@ -42,14 +42,14 @@ public class ModulusTenCUSIPCheckDigitTest extends
AbstractCheckDigitTest {
}
@Test
- public void testVALIDATOR_336_InvalidCheckDigits() {
+ public void testValidator336InvalidCheckDigits() {
for (final String invalidCheckDigit : INVALID_CHECK_DIGITS) {
assertFalse(routine.isValid(invalidCheckDigit), () -> "Should
fail: " + invalidCheckDigit);
}
}
@Test
- public void testVALIDATOR_336_ValidCheckDigits() {
+ public void testValidator336ValidCheckDigits() {
for (final String validCheckDigit : VALID_CHECK_DIGITS) {
assertTrue(routine.isValid(validCheckDigit), () -> "Should fail: "
+ validCheckDigit);
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java
b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java
index 9db5f747..90d03eb0 100644
---
a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java
@@ -45,7 +45,7 @@ public class ModulusTenSedolCheckDigitTest extends
AbstractCheckDigitTest {
}
@Test
- public void testVALIDATOR_346() {
+ public void testValidator346() {
for (final String invalidCheckDigit : INVALID_CHECK_DIGITS) {
assertFalse(routine.isValid(invalidCheckDigit), () -> "Should
fail: " + invalidCheckDigit);
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java
b/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java
index 9c3a48d3..47017a36 100644
---
a/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java
@@ -45,7 +45,7 @@ public class SedolCheckDigitTest extends
AbstractCheckDigitTest {
}
@Test
- public void testVALIDATOR_346() {
+ public void testValidator346() {
for (final String invalidCheckDigit : INVALID_CHECK_DIGITS) {
assertFalse(routine.isValid(invalidCheckDigit), () -> "Should
fail: " + invalidCheckDigit);
}
diff --git a/src/test/java/org/apache/commons/validator/util/FlagsTest.java
b/src/test/java/org/apache/commons/validator/util/FlagsTest.java
index adc47f95..317b5bf4 100644
--- a/src/test/java/org/apache/commons/validator/util/FlagsTest.java
+++ b/src/test/java/org/apache/commons/validator/util/FlagsTest.java
@@ -68,7 +68,7 @@ public class FlagsTest {
}
@Test
- public void testIsOn_isFalseWhenNotAllFlagsInArgumentAreOn() {
+ public void testIsOnIsFalseWhenNotAllFlagsInArgumentAreOn() {
final Flags first = new Flags(1);
final long firstAndSecond = 3;
@@ -76,7 +76,7 @@ public class FlagsTest {
}
@Test
- public void testIsOn_isTrueWhenHighOrderBitIsSetAndQueried() {
+ public void testIsOnIsTrueWhenHighOrderBitIsSetAndQueried() {
final Flags allOn = new Flags(~0);
final long highOrderBit = 0x8000000000000000L;
diff --git
a/src/test/java/org/apache/commons/validator/util/ValidatorUtilsTest.java
b/src/test/java/org/apache/commons/validator/util/ValidatorUtilsTest.java
index d64414f5..bbdf22d8 100644
--- a/src/test/java/org/apache/commons/validator/util/ValidatorUtilsTest.java
+++ b/src/test/java/org/apache/commons/validator/util/ValidatorUtilsTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
* Tests {@link ValidatorUtilsTest}.
*/
public class ValidatorUtilsTest {
-
+
@Test
public void testCopyFastHashMap() {
final FastHashMap original = new FastHashMap();
