[TRUNK-3652] Natural ordering of Patient State is not consistent with equals

k-joseph · wluyima · commit 7cb67115b209 · 2013-08-15T20:14:26.000-04:00
applying auto format
diff --git a/api/src/main/java/org/openmrs/PatientState.java b/api/src/main/java/org/openmrs/PatientState.java
@@ -192,13 +192,18 @@ public void setId(Integer id) {
 	 * @see java.lang.Comparable#compareTo(java.lang.Object)
 	 * @should return positive if startDates equal and this endDate null
 	 * @should return negative if this startDate null
+	 * @should pass if two states have the same start date, end date and uuid
+	 * @should return positive or negative if two states have the same start date and end date but different uuids
 	 */
 	@Override
 	public int compareTo(PatientState o) {
 		int result = OpenmrsUtil.compareWithNullAsEarliest(getStartDate(), o.getStartDate());
 		if (result == 0) {
 			result = OpenmrsUtil.compareWithNullAsLatest(getEndDate(), o.getEndDate());
 		}
+		if (result == 0) {
+			result = OpenmrsUtil.compareWithNullAsGreatest(getUuid(), o.getUuid());
+		}
 		return result;
 	}
 }
diff --git a/api/src/test/java/org/openmrs/PatientStateTest.java b/api/src/test/java/org/openmrs/PatientStateTest.java
@@ -14,10 +14,12 @@
 package org.openmrs;
 
 import java.util.Date;
+import java.util.UUID;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.openmrs.test.Verifies;
 
 public class PatientStateTest {
 	
@@ -31,6 +33,10 @@ public class PatientStateTest {
 	
 	private Date leftOutOfRange;
 	
+	private String uuid2;
+	
+	private String uuid1;
+	
 	@Before
 	public void before() {
 		inRange = new Date();
@@ -259,4 +265,51 @@ public void compareTo_shouldReturnNegativeIfThisStartDateNull() throws Exception
 		Assert.assertTrue(result < 0);
 	}
 	
+	/**
+	 * @see PatientState#compareTo(PatientState)
+	 */
+	@Test
+	@Verifies(value = "pass if two states have the same start date, end date and uuid", method = "compareTo(PatientState)")
+	public void compareTo_shouldPassIfTwoStatesHaveTheSameStartDateEndDateAndUuid() throws Exception {
+		
+		PatientState patientState = new PatientState();
+		patientState.setStartDate(leftRange);
+		patientState.setEndDate(rightRange);
+		patientState.setUuid(uuid1);
+		patientState.setVoided(false);
+		
+		PatientState patientState2 = new PatientState();
+		patientState2.setStartDate(leftRange);
+		patientState2.setEndDate(rightRange);
+		patientState2.setUuid(uuid1);
+		patientState2.setVoided(false);
+		
+		Assert.assertTrue(patientState.compareTo(patientState2) == 0);
+	}
+	
+	/**
+	 * @see PatientState#compareTo(PatientState)
+	 */
+	@Test
+	@Verifies(value = "return positive or negative if two states have the same start date and end date but different uuids", method = "compareTo(PatientState)")
+	public void compareTo_shouldReturnPositiveOrNegativeIfTwoStatesHaveTheSameStartDatesEndDatesAndUuids() throws Exception {
+		uuid1 = UUID.randomUUID().toString();
+		uuid2 = UUID.randomUUID().toString();
+		
+		PatientState patientState = new PatientState();
+		patientState.setStartDate(leftRange);
+		patientState.setEndDate(rightRange);
+		patientState.setUuid(uuid1);
+		patientState.setVoided(false);
+		
+		PatientState patientState2 = new PatientState();
+		patientState2.setStartDate(leftRange);
+		patientState2.setEndDate(rightRange);
+		patientState2.setUuid(uuid2);
+		patientState2.setVoided(false);
+		
+		int result = (patientState.compareTo(patientState2));
+		
+		Assert.assertTrue(result <= -1 || result >= 1);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -192,13 +192,18 @@ public void setId(Integer id) {`
`192`	`192`	`* @see java.lang.Comparable#compareTo(java.lang.Object)`
`193`	`193`	`* @should return positive if startDates equal and this endDate null`
`194`	`194`	`* @should return negative if this startDate null`
	`195`	`+ * @should pass if two states have the same start date, end date and uuid`
	`196`	`+ * @should return positive or negative if two states have the same start date and end date but different uuids`
`195`	`197`	`*/`
`196`	`198`	`@Override`
`197`	`199`	`public int compareTo(PatientState o) {`
`198`	`200`	`int result = OpenmrsUtil.compareWithNullAsEarliest(getStartDate(), o.getStartDate());`
`199`	`201`	`if (result == 0) {`
`200`	`202`	`result = OpenmrsUtil.compareWithNullAsLatest(getEndDate(), o.getEndDate());`
`201`	`203`	`}`
	`204`	`+ if (result == 0) {`
	`205`	`+ result = OpenmrsUtil.compareWithNullAsGreatest(getUuid(), o.getUuid());`
	`206`	`+ }`
`202`	`207`	`return result;`
`203`	`208`	`}`
`204`	`209`	`}`