Merge pull request #363 from jsala1990/master

TRUNK-3257 Added junit test for making voided searches impossible
openmrs · Jul 18, 2013 · ed03fef · ed03fef
2 parents df3b641 + af9f8a8
commit ed03fef
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java b/api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
@@ -240,7 +240,7 @@ private Criterion prepareNameCriterion(String name) {
 		name = name.replace(", ", " ");
 		String[] names = name.split(" ");
 
-		// TODO add junit test for searching on voided patient names
+
 		if (names.length > 0) {
 			String nameSoFar = names[0];
 			for (int i = 0; i < names.length; i++) {

diff --git a/api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java b/api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java
@@ -13,14 +13,16 @@
  */
 package org.openmrs.api.db.hibernate;
 
-import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.openmrs.Patient;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.test.BaseContextSensitiveTest;
 
+import java.util.Collections;
+import java.util.List;
+
 public class HibernatePatientDAOTest extends BaseContextSensitiveTest {
 
 	private HibernatePatientDAO dao = null;
@@ -280,4 +282,18 @@ public void getPatientIdentifierTypes_shouldReturnNonRetiredPatientIdentifierTyp
 		Assert.assertArrayEquals(new Object[] { openMRSIdNumber, oldIdNumber, socialSecNumber }, patientIdentifierTypes
 		        .toArray());
 	}
+
+    @Test
+    public void searchByPatientName_shouldNotMatchVoidedPersonNames(){
+        List<PatientIdentifierType> identifierTypes = Collections.emptyList();
+        List<Patient> patients = dao.getPatients("Hornblower3", null, identifierTypes, false, 0, 11, false);
+        Assert.assertEquals(1, patients.size());
+
+        Patient patient = patients.get(0);
+        patient.setVoided(true);
+        dao.savePatient(patient);
+
+        patients = dao.getPatients("Hornblower3", null, identifierTypes, false, 0, 11, false);
+        Assert.assertEquals(0, patients.size());
+    }
 }