You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2018/04/18 17:25:43 UTC
svn commit: r1829461 - in /commons/proper/validator/trunk/src:
main/java/org/apache/commons/validator/routines/IBANValidator.java
test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
Author: sebb
Date: Wed Apr 18 17:25:43 2018
New Revision: 1829461
URL: http://svn.apache.org/viewvc?rev=1829461&view=rev
Log:
Ensure list really is sorted
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IBANValidator.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IBANValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IBANValidator.java?rev=1829461&r1=1829460&r2=1829461&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IBANValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/IBANValidator.java Wed Apr 18 17:25:43 2018
@@ -127,9 +127,9 @@ public class IBANValidator {
new Validator("HU", 28, "HU\\d{26}" ), // Hungary
new Validator("IE", 22, "IE\\d{2}[A-Z]{4}\\d{14}" ), // Ireland
new Validator("IL", 23, "IL\\d{21}" ), // Israel
+ new Validator("IQ", 23, "IQ\\d{2}[A-Z]{4}\\d{15}" ), // Iraq
new Validator("IS", 26, "IS\\d{24}" ), // Iceland
new Validator("IT", 27, "IT\\d{2}[A-Z]{1}\\d{10}[A-Z0-9]{12}" ), // Italy
- new Validator("IQ", 23, "IQ\\d{2}[A-Z]{4}\\d{15}" ), // Iraq
new Validator("JO", 30, "JO\\d{2}[A-Z]{4}\\d{4}[A-Z0-9]{18}" ), // Jordan
new Validator("KW", 30, "KW\\d{2}[A-Z]{4}[A-Z0-9]{22}" ), // Kuwait
new Validator("KZ", 20, "KZ\\d{5}[A-Z0-9]{13}" ), // Kazakhstan
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java?rev=1829461&r1=1829460&r2=1829461&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java Wed Apr 18 17:25:43 2018
@@ -20,7 +20,9 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.apache.commons.validator.routines.IBANValidator.Validator;
import org.apache.commons.validator.routines.checkdigit.IBANCheckDigit;
import org.junit.Test;
@@ -201,4 +203,22 @@ public class IBANValidatorTest {
assertNotNull("should be present",validator.setValidator("GB", -1, ""));
assertNull("no longer present",validator.setValidator("GB", -1, ""));
}
+
+ @Test
+ public void testSorted() {
+ IBANValidator validator = new IBANValidator();
+ Validator[] vals = validator.getDefaultValidators();
+ assertNotNull(vals);
+ System.out.println();
+ for(int i=1; i < vals.length; i++) {
+ if (vals[i].countryCode.compareTo(vals[i-1].countryCode) <= 0) {
+ fail("Not sorted: "+vals[i].countryCode+ " <= " + vals[i-1].countryCode);
+ }
+ }
+ }
+ public static void main(String [] a) {
+ IBANValidator validator = new IBANValidator();
+ Validator[] vals = validator.getDefaultValidators();
+ System.out.println("Number of entries: " + vals.length);
+ }
}