From 7c98c8d0b7a261e0a6c273667670d9ae3b9feaa6 Mon Sep 17 00:00:00 2001
From: Tomas Lukosius <tomas.lukosius@opencredo.com>
Date: Sun, 24 Apr 2011 07:31:04 +0300
Subject: [PATCH] Added validation for null values.

---
 .../amqp/rabbit/core/RabbitTemplateIntegrationTests.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java
index 7796eddc..289e7b99 100644
--- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java
+++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java
@@ -293,6 +293,7 @@ public class RabbitTemplateIntegrationTests {
 		Message message = new Message("test-message".getBytes(), new MessageProperties());
 		Message reply = template.sendAndReceive(message);
 		assertEquals(new String(message.getBody()), new String(received.get(1000, TimeUnit.MILLISECONDS).getBody()));
+		assertNotNull("Reply is expected", reply);
 		assertEquals(new String(message.getBody()), new String(reply.getBody()));
 		// Message was consumed so nothing left on queue
 		reply = template.receive();
@@ -324,6 +325,7 @@ public class RabbitTemplateIntegrationTests {
 		Message message = new Message("test-message".getBytes(), new MessageProperties());
 		Message reply = template.sendAndReceive(ROUTE, message);
 		assertEquals(new String(message.getBody()), new String(received.get(1000, TimeUnit.MILLISECONDS).getBody()));
+		assertNotNull("Reply is expected", reply);
 		assertEquals(new String(message.getBody()), new String(reply.getBody()));
 		// Message was consumed so nothing left on queue
 		reply = template.receive(ROUTE);
@@ -355,6 +357,7 @@ public class RabbitTemplateIntegrationTests {
 		Message message = new Message("test-message".getBytes(), new MessageProperties());
 		Message reply = template.sendAndReceive("", ROUTE, message);
 		assertEquals(new String(message.getBody()), new String(received.get(1000, TimeUnit.MILLISECONDS).getBody()));
+		assertNotNull("Reply is expected", reply);
 		assertEquals(new String(message.getBody()), new String(reply.getBody()));
 		// Message was consumed so nothing left on queue
 		reply = template.receive(ROUTE);