Author: tchemit Date: 2011-01-20 11:15:07 +0100 (Thu, 20 Jan 2011) New Revision: 2025 Url: http://nuiton.org/repositories/revision/nuiton-utils/2025 Log: test result.isValid() and fix this method Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/ValidatorTestHelper.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java 2011-01-19 16:59:36 UTC (rev 2024) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java 2011-01-20 10:15:07 UTC (rev 2025) @@ -24,6 +24,8 @@ */ package org.nuiton.validator; +import org.apache.commons.collections.MapUtils; + import java.util.ArrayList; import java.util.Collections; import java.util.EnumMap; @@ -55,7 +57,8 @@ public boolean hasMessagesForScope(NuitonValidatorScope scope) { boolean result = false; if (messages != null) { - result = messages.containsKey(scope); + FieldMap<List<String>> map = messages.get(scope); + result = !MapUtils.isEmpty(map); } return result; } Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/ValidatorTestHelper.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/ValidatorTestHelper.java 2011-01-19 16:59:36 UTC (rev 2024) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/ValidatorTestHelper.java 2011-01-20 10:15:07 UTC (rev 2025) @@ -46,8 +46,10 @@ result = validator.validate(person); + // two errors : no name, no firstname // one warning : no pet + Assert.assertFalse(result.isValid()); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_FIRSTNAME, "person.firstname.required"); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME, "person.name.required"); assertFieldMessages(result, NuitonValidatorScope.WARNING, Person.PROPERTY_PET, "person.with.no.pet"); @@ -57,6 +59,7 @@ // one error : no name // one warning : no pet + Assert.assertFalse(result.isValid()); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_FIRSTNAME); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME, "person.name.required"); assertFieldMessages(result, NuitonValidatorScope.WARNING, Person.PROPERTY_PET, "person.with.no.pet"); @@ -66,6 +69,7 @@ // no error // one warning : no pet + Assert.assertTrue(result.isValid()); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_FIRSTNAME); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME); assertFieldMessages(result, NuitonValidatorScope.WARNING, Person.PROPERTY_PET, "person.with.no.pet"); @@ -75,6 +79,7 @@ // no error // no warning + Assert.assertTrue(result.isValid()); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_FIRSTNAME); assertFieldMessages(result, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME); assertFieldMessages(result, NuitonValidatorScope.WARNING, Person.PROPERTY_PET); @@ -91,6 +96,7 @@ // no messages boolean hasMessages = result.hasMessagesForScope(field, scope); Assert.assertFalse(hasMessages); + } else { // with messages