From 7cb67115b209983bde118fcd6c63f49396ca0eb4 Mon Sep 17 00:00:00 2001
From: k-joseph <kaweesi.joseph2012@gmail.com>
Date: Thu, 15 Aug 2013 14:08:12 +0300
Subject: [PATCH] [TRUNK-3652] Natural ordering of Patient State is not
 consistent with equals

applying auto format
---
 .../main/java/org/openmrs/PatientState.java   |  5 ++
 .../java/org/openmrs/PatientStateTest.java    | 53 +++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/api/src/main/java/org/openmrs/PatientState.java b/api/src/main/java/org/openmrs/PatientState.java
index c43261de6aac..544d079d1397 100644
--- a/api/src/main/java/org/openmrs/PatientState.java
+++ b/api/src/main/java/org/openmrs/PatientState.java
@@ -192,6 +192,8 @@ 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) {
@@ -199,6 +201,9 @@ public int compareTo(PatientState o) {
 		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
index 684ed1df58ec..4c1c0315d484 100644
--- 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);
+	}
 }