TRUNK-3820: PersonNameValidator appears to be validating voided perso…

…n names
vinayvenu · Dec 10, 2012 · 81d0750 · 81d0750
1 parent 4235333
commit 81d0750
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/api/src/main/java/org/openmrs/validator/PersonNameValidator.java b/api/src/main/java/org/openmrs/validator/PersonNameValidator.java
@@ -46,6 +46,7 @@ public boolean supports(Class c) {
 	 * @param personName
 	 * @param errors
 	 * @should fail validation if PersonName object is null
+	 * @should pass validation if name is invalid but voided
 	 */
 	public void validate(Object object, Errors errors) {
 		if (log.isDebugEnabled())
@@ -55,7 +56,7 @@ public void validate(Object object, Errors errors) {
 			// Validate that the person name object is not null
 			if (personName == null)
 				errors.reject("error.name");
-			if (!errors.hasErrors())
+			if (!errors.hasErrors() && !personName.isVoided())
 				validatePersonName(personName, errors, true, false);
 		}
 		catch (Exception e) {

diff --git a/api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java b/api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
@@ -656,4 +656,20 @@ public void validatePersonName_shouldNotValidateAgainstRegexForBlankNames() thro
 		new PersonNameValidator().validatePersonName(personName, errors, false, true);
 		Assert.assertFalse(errors.hasErrors());
 	}
+
+	/**
+	 * @see PersonNameValidator#validate(Object,Errors)
+	 * @verifies pass validation if name is invalid but voided
+	 */
+	@Test
+	public void validate_shouldPassValidationIfNameIsInvalidButVoided() throws Exception {
+		PersonName personName = new PersonName();
+		personName.setVoided(true);
+		personName.setFamilyName2("34dfgd"); //invalid familyName2
+
+		Errors errors = new BindException(personName, "familyName2");
+		new PersonNameValidator().validate(personName, errors);
+
+		Assert.assertFalse(errors.hasErrors());
+	}
 }