Adding previously removed test - TRUNK-4056

openmrs · Nov 19, 2013 · 484106b · 484106b
1 parent f870162
commit 484106b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
@@ -1529,8 +1529,11 @@ public void mergePatients(Patient preferred, List<Patient> notPreferred) throws
 	 */
 	public PatientIdentifier savePatientIdentifier(PatientIdentifier patientIdentifier) throws APIException {
 		//if the argument or the following required fields are not specified
-		PatientIdentifierType.LocationBehavior locationBehavior = patientIdentifier.getIdentifierType()
-		        .getLocationBehavior();
+		PatientIdentifierType.LocationBehavior locationBehavior = null;
+		if (patientIdentifier != null) {
+			patientIdentifier.getIdentifierType().getLocationBehavior();
+		}
+
 		if (patientIdentifier == null
 		        || patientIdentifier.getPatient() == null
 		        || patientIdentifier.getIdentifierType() == null

diff --git a/api/src/test/java/org/openmrs/api/PatientServiceTest.java b/api/src/test/java/org/openmrs/api/PatientServiceTest.java
@@ -3446,4 +3446,13 @@ public void getCountOfPatients_shouldReturnTheRightCountOfPatientsWithAMatchingI
 		Assert.assertEquals(1, patientService.getCountOfPatients(identifier).intValue());
 	}
 
+	/**
+	 * @verifies {@link PatientService#savePatientIdentifier(PatientIdentifier)} test = should throw
+	 *           an APIException when a null argument is passed
+	 */
+	@Test(expected = APIException.class)
+	@Verifies(value = "should throw an APIException when a null argument is passed", method = "savePatientIdentifier(PatientIdentifier)")
+	public void savePatientIdentifier_shouldThrowAnAPIExceptionWhenANullArgumentIsPassed() throws Exception {
+		patientService.savePatientIdentifier(null);
+	}
 }