You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/21 18:35:54 UTC
[commons-validator] branch master updated: Use for-each.
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 50946d8 Use for-each.
50946d8 is described below
commit 50946d8d5c389fb55984faac3f204d35a89097af
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 13:35:49 2020 -0500
Use for-each.
---
src/main/java/org/apache/commons/validator/Field.java | 18 ++++++------------
src/main/java/org/apache/commons/validator/Form.java | 7 +++----
.../java/org/apache/commons/validator/FormSet.java | 11 ++++-------
.../org/apache/commons/validator/UrlValidator.java | 4 ++--
.../apache/commons/validator/ValidatorResources.java | 15 ++++++---------
.../org/apache/commons/validator/ValidatorResults.java | 3 +--
.../commons/validator/routines/RegexValidator.java | 12 ++++++------
.../commons/validator/routines/UrlValidator.java | 4 ++--
.../java/org/apache/commons/validator/EmailTest.java | 6 +++---
.../commons/validator/GenericTypeValidatorTest.java | 7 ++-----
.../commons/validator/MultipleConfigFilesTest.java | 4 ++--
.../org/apache/commons/validator/RetrieveFormTest.java | 4 ++--
.../java/org/apache/commons/validator/UrlTest.java | 3 +--
.../validator/routines/DomainValidatorTest.java | 6 +++---
.../commons/validator/routines/EmailValidatorTest.java | 6 +++---
.../commons/validator/routines/UrlValidatorTest.java | 3 +--
.../routines/checkdigit/CUSIPCheckDigitTest.java | 6 ++----
.../routines/checkdigit/IBANCheckDigitTest.java | 6 +++---
.../routines/checkdigit/ISINCheckDigitTest.java | 3 +--
.../checkdigit/ModulusTenCUSIPCheckDigitTest.java | 6 ++----
.../checkdigit/ModulusTenSedolCheckDigitTest.java | 3 +--
.../routines/checkdigit/SedolCheckDigitTest.java | 3 +--
22 files changed, 57 insertions(+), 83 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/Field.java b/src/main/java/org/apache/commons/validator/Field.java
index 6d1c575..1d324b7 100644
--- a/src/main/java/org/apache/commons/validator/Field.java
+++ b/src/main/java/org/apache/commons/validator/Field.java
@@ -566,8 +566,7 @@ public class Field implements Cloneable, Serializable {
this.generateKey();
// Process FormSet Constants
- for (Iterator<Entry<String, String>> i = constants.entrySet().iterator(); i.hasNext();) {
- Entry<String, String> entry = i.next();
+ for (Entry<String, String> entry : constants.entrySet()) {
String key1 = entry.getKey();
String key2 = TOKEN_START + key1 + TOKEN_END;
String replaceValue = entry.getValue();
@@ -580,8 +579,7 @@ public class Field implements Cloneable, Serializable {
}
// Process Global Constants
- for (Iterator<Entry<String, String>> i = globalConstants.entrySet().iterator(); i.hasNext();) {
- Entry<String, String> entry = i.next();
+ for (Entry<String, String> entry : globalConstants.entrySet()) {
String key1 = entry.getKey();
String key2 = TOKEN_START + key1 + TOKEN_END;
String replaceValue = entry.getValue();
@@ -594,8 +592,7 @@ public class Field implements Cloneable, Serializable {
}
// Process Var Constant Replacement
- for (Iterator<String> i = getVarMap().keySet().iterator(); i.hasNext();) {
- String key1 = i.next();
+ for (String key1 : getVarMap().keySet()) {
String key2 = TOKEN_START + TOKEN_VAR + key1 + TOKEN_END;
Var var = this.getVar(key1);
String replaceValue = var.getValue();
@@ -627,8 +624,7 @@ public class Field implements Cloneable, Serializable {
String varKey = TOKEN_START + TOKEN_VAR;
// Process Messages
if (key != null && !key.startsWith(varKey)) {
- for (Iterator<Msg> i = getMsgMap().values().iterator(); i.hasNext();) {
- Msg msg = i.next();
+ for (Msg msg : getMsgMap().values()) {
msg.setKey(ValidatorUtils.replace(msg.getKey(), key, replaceValue));
}
}
@@ -641,9 +637,8 @@ public class Field implements Cloneable, Serializable {
* pairs passed in.
*/
private void processArg(String key, String replaceValue) {
- for (int i = 0; i < this.args.length; i++) {
+ for (Map<String, Arg> argMap : this.args) {
- Map<String, Arg> argMap = this.args[i];
if (argMap == null) {
continue;
}
@@ -734,8 +729,7 @@ public class Field implements Cloneable, Serializable {
if (hVars != null) {
results.append("\t\tVars:\n");
- for (Iterator<?> i = getVarMap().keySet().iterator(); i.hasNext();) {
- Object key1 = i.next();
+ for (Object key1 : getVarMap().keySet()) {
results.append("\t\t\t");
results.append(key1);
results.append("=");
diff --git a/src/main/java/org/apache/commons/validator/Form.java b/src/main/java/org/apache/commons/validator/Form.java
index 45b560c..e522f98 100644
--- a/src/main/java/org/apache/commons/validator/Form.java
+++ b/src/main/java/org/apache/commons/validator/Form.java
@@ -190,8 +190,7 @@ public class Form implements Serializable {
//we want to go all the way up the tree
parent.process(constants, globalConstants, forms);
}
- for (Iterator<Field> i = parent.getFields().iterator(); i.hasNext(); ) {
- Field f = i.next();
+ for (Field f : parent.getFields()) {
//we want to be able to override any fields we like
if (getFieldMap().get(f.getKey()) == null) {
lFields.add(n, f);
@@ -224,9 +223,9 @@ public class Form implements Serializable {
results.append(name);
results.append("\n");
- for (Iterator<Field> i = lFields.iterator(); i.hasNext(); ) {
+ for (Field lField : lFields) {
results.append("\tField: \n");
- results.append(i.next());
+ results.append(lField);
results.append("\n");
}
diff --git a/src/main/java/org/apache/commons/validator/FormSet.java b/src/main/java/org/apache/commons/validator/FormSet.java
index 72aff82..fafc49e 100644
--- a/src/main/java/org/apache/commons/validator/FormSet.java
+++ b/src/main/java/org/apache/commons/validator/FormSet.java
@@ -19,7 +19,6 @@ package org.apache.commons.validator;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -151,8 +150,7 @@ public class FormSet implements Serializable {
if (depends != null) {
Map<String, Form> pForms = getForms();
Map<String, Form> dForms = depends.getForms();
- for (Iterator<Entry<String, Form>> it = dForms.entrySet().iterator(); it.hasNext(); ) {
- Entry<String, Form> entry = it.next();
+ for (Entry<String, Form> entry : dForms.entrySet()) {
String key = entry.getKey();
Form pForm = pForms.get(key);
if (pForm != null) {//merge, but principal 'rules', don't overwrite
@@ -293,8 +291,7 @@ public class FormSet implements Serializable {
* @param globalConstants Global constants
*/
synchronized void process(Map<String, String> globalConstants) {
- for (Iterator<Form> i = forms.values().iterator(); i.hasNext(); ) {
- Form f = i.next();
+ for (Form f : forms.values()) {
f.process(globalConstants, constants, forms);
}
@@ -350,9 +347,9 @@ public class FormSet implements Serializable {
results.append(variant);
results.append("\n");
- for (Iterator<?> i = getForms().values().iterator(); i.hasNext(); ) {
+ for (Object name : getForms().values()) {
results.append(" ");
- results.append(i.next());
+ results.append(name);
results.append("\n");
}
diff --git a/src/main/java/org/apache/commons/validator/UrlValidator.java b/src/main/java/org/apache/commons/validator/UrlValidator.java
index 0aa4b12..f190667 100644
--- a/src/main/java/org/apache/commons/validator/UrlValidator.java
+++ b/src/main/java/org/apache/commons/validator/UrlValidator.java
@@ -336,8 +336,8 @@ public class UrlValidator implements Serializable {
// TODO: Rewrite to use ArrayList and .add semantics: see VALIDATOR-203
char[] chars = hostIP.toCharArray();
int size = 1;
- for(int i=0; i<chars.length; i++) {
- if(chars[i] == '.') {
+ for (char element : chars) {
+ if(element == '.') {
size++;
}
}
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResources.java b/src/main/java/org/apache/commons/validator/ValidatorResources.java
index ebbb8f0..496d56b 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResources.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResources.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
import java.io.Serializable;
import java.net.URL;
import java.util.Collections;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -192,9 +191,9 @@ public class ValidatorResources implements Serializable {
throws IOException, SAXException {
Digester digester = initDigester();
- for (int i = 0; i < uris.length; i++) {
+ for (String element : uris) {
digester.push(this);
- digester.parse(uris[i]);
+ digester.parse(element);
}
this.process();
@@ -229,9 +228,9 @@ public class ValidatorResources implements Serializable {
throws IOException, SAXException {
Digester digester = initDigester();
- for (int i = 0; i < urls.length; i++) {
+ for (URL url : urls) {
digester.push(this);
- digester.parse(urls[i]);
+ digester.parse(url);
}
this.process();
@@ -535,15 +534,13 @@ public class ValidatorResources implements Serializable {
}
defaultFormSet.process(getConstants());
// Loop through FormSets and merge if necessary
- for (Iterator<String> i = getFormSets().keySet().iterator(); i.hasNext();) {
- String key = i.next();
+ for (String key : getFormSets().keySet()) {
FormSet fs = getFormSets().get(key);
fs.merge(getParent(fs));
}
// Process Fully Constructed FormSets
- for (Iterator<FormSet> i = getFormSets().values().iterator(); i.hasNext();) {
- FormSet fs = i.next();
+ for (FormSet fs : getFormSets().values()) {
if (!fs.isProcessed()) {
fs.process(getConstants());
}
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResults.java b/src/main/java/org/apache/commons/validator/ValidatorResults.java
index 50f3f55..f3054f3 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResults.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResults.java
@@ -132,8 +132,7 @@ public class ValidatorResults implements Serializable {
public Map<String, Object> getResultValueMap() {
Map<String, Object> results = new HashMap<>();
- for (Iterator<String> i = hResults.keySet().iterator(); i.hasNext();) {
- String propertyKey = i.next();
+ for (String propertyKey : hResults.keySet()) {
ValidatorResult vr = this.getValidatorResult(propertyKey);
for (Iterator<String> x = vr.getActions(); x.hasNext();) {
diff --git a/src/main/java/org/apache/commons/validator/routines/RegexValidator.java b/src/main/java/org/apache/commons/validator/routines/RegexValidator.java
index 3214b4e..78195f2 100644
--- a/src/main/java/org/apache/commons/validator/routines/RegexValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/RegexValidator.java
@@ -142,8 +142,8 @@ public class RegexValidator implements Serializable {
if (value == null) {
return false;
}
- for (int i = 0; i < patterns.length; i++) {
- if (patterns[i].matcher(value).matches()) {
+ for (Pattern pattern : patterns) {
+ if (pattern.matcher(value).matches()) {
return true;
}
}
@@ -162,8 +162,8 @@ public class RegexValidator implements Serializable {
if (value == null) {
return null;
}
- for (int i = 0; i < patterns.length; i++) {
- Matcher matcher = patterns[i].matcher(value);
+ for (Pattern pattern : patterns) {
+ Matcher matcher = pattern.matcher(value);
if (matcher.matches()) {
int count = matcher.groupCount();
String[] groups = new String[count];
@@ -189,8 +189,8 @@ public class RegexValidator implements Serializable {
if (value == null) {
return null;
}
- for (int i = 0; i < patterns.length; i++) {
- Matcher matcher = patterns[i].matcher(value);
+ for (Pattern pattern : patterns) {
+ Matcher matcher = pattern.matcher(value);
if (matcher.matches()) {
int count = matcher.groupCount();
if (count == 1) {
diff --git a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
index 03799ff..5e3babc 100644
--- a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java
@@ -278,8 +278,8 @@ public class UrlValidator implements Serializable {
schemes = DEFAULT_SCHEMES;
}
allowedSchemes = new HashSet<>(schemes.length);
- for(int i=0; i < schemes.length; i++) {
- allowedSchemes.add(schemes[i].toLowerCase(Locale.ENGLISH));
+ for (String scheme : schemes) {
+ allowedSchemes.add(scheme.toLowerCase(Locale.ENGLISH));
}
}
diff --git a/src/test/java/org/apache/commons/validator/EmailTest.java b/src/test/java/org/apache/commons/validator/EmailTest.java
index dbcb576..4e35125 100644
--- a/src/test/java/org/apache/commons/validator/EmailTest.java
+++ b/src/test/java/org/apache/commons/validator/EmailTest.java
@@ -409,9 +409,9 @@ protected void setUp() throws IOException, SAXException {
*/
public void _testEmailFromPerl() throws ValidatorException {
ValueBean info = new ValueBean();
- for (int index = 0; index < testEmailFromPerl.length; index++) {
- info.setValue(testEmailFromPerl[index].item);
- valueTest(info, testEmailFromPerl[index].valid);
+ for (ResultPair element : testEmailFromPerl) {
+ info.setValue(element.item);
+ valueTest(info, element.valid);
}
}
diff --git a/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java b/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
index da6d45d..e8dac9d 100644
--- a/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.validator;
import java.io.IOException;
import java.util.Date;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -98,8 +97,7 @@ protected void tearDown() {
assertTrue("Expecting float result to be an instance of Float.", (hResultValues.get("float") instanceof Float));
assertTrue("Expecting double result to be an instance of Double.", (hResultValues.get("double") instanceof Double));
- for (Iterator<String> i = hResultValues.keySet().iterator(); i.hasNext(); ) {
- String key = i.next();
+ for (String key : hResultValues.keySet()) {
Object value = hResultValues.get(key);
assertNotNull("value ValidatorResults.getResultValueMap() should not be null.", value);
@@ -179,8 +177,7 @@ protected void tearDown() {
assertTrue("Expecting double result to be an instance of Double for locale: "+locale, (hResultValues.get("double") instanceof Double));
assertTrue("Expecting date result to be an instance of Date for locale: "+locale, (hResultValues.get("date") instanceof Date));
- for (Iterator<String> i = hResultValues.keySet().iterator(); i.hasNext(); ) {
- String key = i.next();
+ for (String key : hResultValues.keySet()) {
Object value = hResultValues.get(key);
assertNotNull("value ValidatorResults.getResultValueMap() should not be null for locale: "+locale, value);
diff --git a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
index 7d08082..96eb6a9 100644
--- a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
@@ -69,8 +69,8 @@ public class MultipleConfigFilesTest extends TestCase {
this.resources = new ValidatorResources(streams);
- for (int i = 0; i < streams.length; i++) {
- streams[i].close();
+ for (InputStream stream : streams) {
+ stream.close();
}
}
diff --git a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
index 4b72857..98dce30 100644
--- a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
+++ b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
@@ -64,8 +64,8 @@ public class RetrieveFormTest extends TestCase {
this.resources = new ValidatorResources(streams);
- for (int i = 0; i < streams.length; i++) {
- streams[i].close();
+ for (InputStream stream : streams) {
+ stream.close();
}
}
diff --git a/src/test/java/org/apache/commons/validator/UrlTest.java b/src/test/java/org/apache/commons/validator/UrlTest.java
index af8c083..b64997e 100644
--- a/src/test/java/org/apache/commons/validator/UrlTest.java
+++ b/src/test/java/org/apache/commons/validator/UrlTest.java
@@ -59,8 +59,7 @@ protected void setUp() {
String[] schemes = {"http", "gopher"};
//UrlValidator urlVal = new UrlValidator(schemes,false,false,false);
UrlValidator urlVal = new UrlValidator(schemes, 0);
- for (int sIndex = 0; sIndex < testScheme.length; sIndex++) {
- ResultPair testPair = testScheme[sIndex];
+ for (ResultPair testPair : testScheme) {
boolean result = urlVal.isValidScheme(testPair.item);
assertEquals(testPair.item, testPair.valid, result);
if (printStatus) {
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 3de6740..20017cd 100644
--- a/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
@@ -589,9 +589,9 @@ public class DomainValidatorTest extends TestCase {
}
private static boolean isInIanaList(String name, String [] array, Set<String> ianaTlds) {
- for(int i = 0; i < array.length; i++) {
- if (!ianaTlds.contains(array[i])) {
- System.out.println(name + " contains unexpected value: " + array[i]);
+ for (String element : array) {
+ if (!ianaTlds.contains(element)) {
+ System.out.println(name + " contains unexpected value: " + element);
}
}
return true;
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 433867d..dd684a6 100644
--- a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
@@ -493,9 +493,9 @@ public class EmailValidatorTest {
@Test
public void testEmailFromPerl() {
int errors = 0;
- for (int index = 0; index < testEmailFromPerl.length; index++) {
- String item = testEmailFromPerl[index].item;
- boolean exp = testEmailFromPerl[index].valid;
+ for (ResultPair element : testEmailFromPerl) {
+ String item = element.item;
+ boolean exp = element.valid;
boolean act = validator.isValid(item);
if (act != exp) {
System.out.printf("%s: expected %s actual %s%n", item, exp, act);
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 173b381..8b51c76 100644
--- a/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
@@ -63,8 +63,7 @@ public class UrlValidatorTest {
}
//UrlValidator urlVal = new UrlValidator(schemes,false,false,false);
UrlValidator urlVal = new UrlValidator(schemes, 0);
- for (int sIndex = 0; sIndex < testScheme.length; sIndex++) {
- ResultPair testPair = testScheme[sIndex];
+ for (ResultPair testPair : testScheme) {
boolean result = urlVal.isValidScheme(testPair.item);
assertEquals(testPair.item, testPair.valid, result);
if (printStatus) {
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 b45d19e..700ad32 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
@@ -58,8 +58,7 @@ public class CUSIPCheckDigitTest extends AbstractCheckDigitTest {
};
public void testVALIDATOR_336_InvalidCheckDigits() {
- for (int i = 0; i < invalidCheckDigits.length; i++) {
- String invalidCheckDigit = invalidCheckDigits[i];
+ for (String invalidCheckDigit : invalidCheckDigits) {
assertFalse("Should fail: " + invalidCheckDigit, routine.isValid(invalidCheckDigit));
}
}
@@ -67,8 +66,7 @@ public class CUSIPCheckDigitTest extends AbstractCheckDigitTest {
private static String validCheckDigits[] = {"DUS0421C5"};
public void testVALIDATOR_336_ValidCheckDigits() {
- for (int i = 0; i < validCheckDigits.length; i++) {
- String validCheckDigit = validCheckDigits[i];
+ for (String validCheckDigit : validCheckDigits) {
assertTrue("Should fail: " + validCheckDigit, routine.isValid(validCheckDigit));
}
}
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
index efb70fb..92b6d86 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
@@ -190,9 +190,9 @@ public class IBANCheckDigitTest extends AbstractCheckDigitTest {
List<String> list = new ArrayList<>();
// create invalid check digit values
- for (int i = 0; i < codes.length; i++) {
- String code = removeCheckDigit(codes[i]);
- String check = checkDigit(codes[i]);
+ for (String code2 : codes) {
+ String code = removeCheckDigit(code2);
+ String check = checkDigit(code2);
for (int j = 2; j <= 98; j++) { // check digits can be from 02-98 (00 and 01 are not possible)
String curr = j > 9 ? "" + j : "0" + j;
if (!curr.equals(check)) {
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 a3e218d..6d293c6 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
@@ -66,8 +66,7 @@ public class ISINCheckDigitTest extends AbstractCheckDigitTest {
};
public void testVALIDATOR_345() {
- for (int i = 0; i < invalidCheckDigits.length; i++) {
- String invalidCheckDigit = invalidCheckDigits[i];
+ for (String invalidCheckDigit : invalidCheckDigits) {
assertFalse("Should fail: " + invalidCheckDigit, routine.isValid(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 35fa8be..2834e08 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
@@ -57,8 +57,7 @@ public class ModulusTenCUSIPCheckDigitTest extends AbstractCheckDigitTest {
};
public void testVALIDATOR_336_InvalidCheckDigits() {
- for (int i = 0; i < invalidCheckDigits.length; i++) {
- String invalidCheckDigit = invalidCheckDigits[i];
+ for (String invalidCheckDigit : invalidCheckDigits) {
assertFalse("Should fail: " + invalidCheckDigit, routine.isValid(invalidCheckDigit));
}
}
@@ -66,8 +65,7 @@ public class ModulusTenCUSIPCheckDigitTest extends AbstractCheckDigitTest {
private static String validCheckDigits[] = {"DUS0421C5"};
public void testVALIDATOR_336_ValidCheckDigits() {
- for (int i = 0; i < validCheckDigits.length; i++) {
- String validCheckDigit = validCheckDigits[i];
+ for (String validCheckDigit : validCheckDigits) {
assertTrue("Should fail: " + validCheckDigit, routine.isValid(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 c385406..12be5b8 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
@@ -59,8 +59,7 @@ public class ModulusTenSedolCheckDigitTest extends AbstractCheckDigitTest {
};
public void testVALIDATOR_346() {
- for (int i = 0; i < invalidCheckDigits.length; i++) {
- String invalidCheckDigit = invalidCheckDigits[i];
+ for (String invalidCheckDigit : invalidCheckDigits) {
assertFalse("Should fail: " + invalidCheckDigit, routine.isValid(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 269473e..4b921dd 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
@@ -60,8 +60,7 @@ public class SedolCheckDigitTest extends AbstractCheckDigitTest {
};
public void testVALIDATOR_346() {
- for (int i = 0; i < invalidCheckDigits.length; i++) {
- String invalidCheckDigit = invalidCheckDigits[i];
+ for (String invalidCheckDigit : invalidCheckDigits) {
assertFalse("Should fail: " + invalidCheckDigit, routine.isValid(invalidCheckDigit));
}
}