Author: athimel Date: 2011-11-30 09:52:51 +0100 (Wed, 30 Nov 2011) New Revision: 2240 Url: http://nuiton.org/repositories/revision/nuiton-utils/2240 Log: Anomalie #1837 FrenchSiret validator does not support spaces Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java 2011-11-29 14:34:18 UTC (rev 2239) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java 2011-11-30 08:52:51 UTC (rev 2240) @@ -86,6 +86,9 @@ return; } + // Remove any space + siret = siret.replaceAll(" ", ""); + Matcher m = p.matcher(siret); if (!m.matches() || !luhnChecksum(siret)) { addFieldError(fieldName, object); Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java 2011-11-29 14:34:18 UTC (rev 2239) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java 2011-11-30 08:52:51 UTC (rev 2240) @@ -94,5 +94,11 @@ bean.setSiret(null); assertFieldInError(Company.PROPERTY_SIRET, "company.siret.format", false); + + // Valid siret with spaces + bean.setSiret("535 198 188 00018 "); + assertFieldInError(Company.PROPERTY_SIRET, "company.siret.format", + false); + } }