TRUNK-4208: Removed gender as a requirement during PersonValidation, …

…added it instead to PatientValidation.

- Moved unit tests from PersonValidatorTest to PatientValidatorTest to reflect this new behaviour.

- Birthdate is already *not* a requirement for Persons.

- Added test for PersonValidator to check that it's not validating gender requirement.

TRUNK-4208: Refactored PersonValidator. Extracted birth date validation into it's own method.

api/src/main/java/org/openmrs/validator/PatientValidator.java

@@ -24,6 +24,7 @@
 import org.openmrs.Patient;
 import org.openmrs.PatientIdentifier;
 import org.openmrs.PatientIdentifierType;
+import org.springframework.validation.ValidationUtils;
 import org.openmrs.annotation.Handler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.Errors;
@@ -84,6 +85,8 @@ public void validate(Object obj, Errors errors) {
 
 		Patient patient = (Patient) obj;
 
+		ValidationUtils.rejectIfEmptyOrWhitespace(errors, "gender", "Person.gender.required");
+
 		if (PatientIdentifierValidator.hasMoreThanOneIdentifierForSameIdentifierType(patient.getActiveIdentifiers())) {
 			errors.reject("error.duplicateIdentifierTypes");
 		}

api/src/main/java/org/openmrs/validator/PersonValidator.java

@@ -50,11 +50,11 @@ public boolean supports(Class<?> clazz) {
 	/**
 	 * @see org.springframework.validation.Validator#validate(java.lang.Object,
 	 *      org.springframework.validation.Errors)
-	 * @should fail validation if gender is blank
 	 * @should fail validation if birthdate makes patient older that 120 years old
 	 * @should fail validation if birthdate is a future date
 	 * @should fail validation if voidReason is blank when patient is voided
 	 * @should fail validation if causeOfDeath is blank when patient is dead
+	 * @should pass validation if gender is blank for Persons
 	 */
 	@Override
 	public void validate(Object target, Errors errors) {
@@ -68,8 +68,6 @@ public void validate(Object target, Errors errors) {
 
 		Person person = (Person) target;
 
-		ValidationUtils.rejectIfEmptyOrWhitespace(errors, "gender", "Person.gender.required");
-
 		boolean atLeastOneNonVoidPersonNameLeft = false;
 		for (PersonName personName : person.getNames()) {
 			personNameValidator.validate(personName, errors);
@@ -94,19 +92,7 @@ public void validate(Object target, Errors errors) {
 			}
 		}
 
-		// check birth date against future dates and really old dates
-		if (person.getBirthdate() != null) {
-			if (person.getBirthdate().after(new Date())) {
-				errors.rejectValue("birthdate", "error.date.future");
-			} else {
-				Calendar c = Calendar.getInstance();
-				c.setTime(new Date());
-				c.add(Calendar.YEAR, -120); // person cannot be older than 120 years old
-				if (person.getBirthdate().before(c.getTime())) {
-					errors.rejectValue("birthdate", "error.date.nonsensical");
-				}
-			}
-		}
+		validateBirthDate(errors, person.getBirthdate());
 
 		if (person.isVoided()) {
 			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "voidReason", "error.null");
@@ -118,4 +104,25 @@ public void validate(Object target, Errors errors) {
 		ValidateUtil.validateFieldLengths(errors, Person.class, "gender");
 	}
 
+	/**
+	 * Checks if the birth date specified is in the future or older than 120 years old..
+	 *
+	 * @param birthDate The birthdate to validate.
+	 * @param errors Stores information about errors encountered during validation.
+	 */
+	private void validateBirthDate(Errors errors, Date birthDate) {
+		if (birthDate != null) {
+			if (birthDate.after(new Date())) {
+				errors.rejectValue("birthdate", "error.date.future");
+			} else {
+				Calendar c = Calendar.getInstance();
+				c.setTime(new Date());
+				c.add(Calendar.YEAR, -120);
+				if (birthDate.before(c.getTime())) {
+					errors.rejectValue("birthdate", "error.date.nonsensical");
+				}
+			}
+		}
+	}
+
 }

api/src/test/java/org/openmrs/validator/PatientValidatorTest.java

@@ -168,4 +168,19 @@ public void validate_shouldPassTheValidatePatientIfSameIdentifierTypesAreAddedOn
 
 		Assert.assertFalse(errors.hasErrors());
 	}
+
+	/**
+	 * @see {@link org.openmrs.validator.PatientValidator#validate(Object,Errors)}
+	 * @verifies fail validation if gender is blank
+	 */
+	@Test
+	@Verifies(value = "should fail validation if gender is blank", method = "validate(Object,Errors)")
+	public void validate_shouldFailValidationIfGenderIsBlank() throws Exception {
+		Patient pa = new Patient(1);
+		Errors errors = new BindException(pa, "patient");
+		validator.validate(pa, errors);
+
+		Assert.assertTrue(errors.hasFieldErrors("gender"));
+	}
+
 }

api/src/test/java/org/openmrs/validator/PersonValidatorTest.java

@@ -19,6 +19,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openmrs.Patient;
+import org.openmrs.Person;
 import org.openmrs.api.context.Context;
 import org.openmrs.test.BaseContextSensitiveTest;
 import org.openmrs.test.Verifies;
@@ -94,21 +95,6 @@ public void validate_shouldFailValidationIfCauseOfDeathIsBlankWhenPatientIsDead(
 		Assert.assertTrue(errors.hasFieldErrors("causeOfDeath"));
 	}
 
-	/**
-	 * @see PersonValidator#validate(Object,Errors)
-	 * @verifies fail validation if gender is blank
-	 */
-	@Test
-	@Verifies(value = "should fail validation if gender is blank", method = "validate(Object,Errors)")
-	public void validate_shouldFailValidationIfGenderIsBlank() throws Exception {
-		Patient pa = new Patient(1);
-		Errors errors = new BindException(pa, "patient");
-		validator.validate(pa, errors);
-
-		Assert.assertTrue(errors.hasFieldErrors("gender"));
-
-	}
-
 	/**
 	 * @see PersonValidator#validate(Object,Errors)
 	 * @verifies fail validation if voidReason is blank when patient is voided
@@ -136,4 +122,20 @@ public void validate_shouldFailValidationIfPersonDoesNotHaveAtleastOneNonVoidedN
 		validator.validate(pa, errors);
 		Assert.assertTrue(errors.hasFieldErrors("names"));
 	}
+
+	/**
+	 * @see {@link org.openmrs.validator.PersonValidator#validate(Object,Errors)}
+	 * @verifies pass validation if gender is blank for Persons
+	 */
+	@Test
+	@Verifies(value = "should pass validation if gender is blank for Persons", method = "validate(Object,Errors)")
+	public void validate_shouldPassValidationIfGenderIsBlankForPersons() throws Exception {
+		Person person = new Person(1);
+		Errors errors = new BindException(person, "person");
+		PersonValidator personValidator = new PersonValidator();
+		personValidator.validate(person, errors);
+
+		Assert.assertFalse(errors.hasFieldErrors("gender"));
+	}
+
 }