From de1b0c14024243e511cf3cd7114b2ac4183049c7 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 2 Aug 2011 17:24:41 -0400
Subject: [PATCH] MongoMessageStoreTests now actually assert the payload,
 headers, and Message itself all are equal before and after storing

---
 .../mongodb/store/MongoMessageStoreTests.java | 58 ++++++++++++++++---
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoMessageStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoMessageStoreTests.java
index c609142ccb..3a219c30bf 100644
--- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoMessageStoreTests.java
+++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoMessageStoreTests.java
@@ -16,6 +16,9 @@
 
 package org.springframework.integration.mongodb.store;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.Test;
 
 import org.springframework.data.mongodb.MongoDbFactory;
@@ -27,8 +30,6 @@ import org.springframework.integration.support.MessageBuilder;
 
 import com.mongodb.Mongo;
 
-import static org.junit.Assert.assertNotNull;
-
 /**
  * @author Mark Fisher
  * @author Oleg Zhurakousky
@@ -41,14 +42,14 @@ public class MongoMessageStoreTests extends MongoDbAvailableTests{
 		MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new Mongo(), "test");
 		MongoMessageStore store = new MongoMessageStore(mongoDbFactory);
 		Message<?> messageToStore = MessageBuilder.withPayload("Hello").build();
-		//System.out.println("before: " + messageToStore);
 		store.addMessage(messageToStore);
 		Message<?> retrievedMessage = store.getMessage(messageToStore.getHeaders().getId());
-		//System.out.println("after: " + retrievedMessage);
 		assertNotNull(retrievedMessage);
+		assertEquals(messageToStore.getPayload(), retrievedMessage.getPayload());
+		assertEquals(messageToStore.getHeaders(), retrievedMessage.getHeaders());
+		assertEquals(messageToStore, retrievedMessage);
 	}
-	
-	
+
 	@Test 
 	@MongoDbAvailable
 	public void addGetWithObjectDefaultConstructorPayload() throws Exception {
@@ -58,11 +59,12 @@ public class MongoMessageStoreTests extends MongoDbAvailableTests{
 		p.setFname("John");
 		p.setLname("Doe");
 		Message<?> messageToStore = MessageBuilder.withPayload(p).build();
-		//System.out.println("before: " + messageToStore);
 		store.addMessage(messageToStore);
 		Message<?> retrievedMessage = store.getMessage(messageToStore.getHeaders().getId());
-		//System.out.println("after: " + retrievedMessage);
 		assertNotNull(retrievedMessage);
+		assertEquals(messageToStore.getPayload(), retrievedMessage.getPayload());
+		assertEquals(messageToStore.getHeaders(), retrievedMessage.getHeaders());
+		assertEquals(messageToStore, retrievedMessage);
 	}
 
 
@@ -87,6 +89,46 @@ public class MongoMessageStoreTests extends MongoDbAvailableTests{
 		public void setLname(String lname) {
 			this.lname = lname;
 		}
+
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + ((fname == null) ? 0 : fname.hashCode());
+			result = prime * result + ((lname == null) ? 0 : lname.hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (obj == null) {
+				return false;
+			}
+			if (getClass() != obj.getClass()) {
+				return false;
+			}
+			Person other = (Person) obj;
+			if (fname == null) {
+				if (other.fname != null) {
+					return false;
+				}
+			}
+			else if (!fname.equals(other.fname)) {
+				return false;
+			}
+			if (lname == null) {
+				if (other.lname != null) {
+					return false;
+				}
+			}
+			else if (!lname.equals(other.lname)) {
+				return false;
+			}
+			return true;
+		}
 	}
 
 }