From d2920c314502aae9c8a2ff0baf6e4faa19a3ee10 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 29 Nov 2011 09:51:03 -0500
Subject: [PATCH] INT-2280 polishing Jdbc tests hoping to avoid intermittent
 failures

---
 .../JdbcMessageStoreChannelIntegrationTests-context.xml     | 2 +-
 .../jdbc/JdbcMessageStoreChannelTests-context.xml           | 2 +-
 .../integration/jdbc/JdbcMessageStoreChannelTests.java      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests-context.xml
index 916ce47d06..289a5b802e 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests-context.xml
@@ -27,7 +27,7 @@
 
 	<bean id="storeQueue" class="org.springframework.integration.store.MessageGroupQueue">
 		<constructor-arg ref="messageStore" />
-		<constructor-arg value="input-queue" />
+		<constructor-arg value="JdbcMessageStoreChannelIntegrationTests" />
 		<property name="storeLock" ref="lock" />
 	</bean>
 
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
index 997a101146..ba41b34921 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
@@ -27,7 +27,7 @@
 
 	<bean id="queue" class="org.springframework.integration.store.MessageGroupQueue">
 		<constructor-arg ref="messageStore" />
-		<constructor-arg value="input-queue" />
+		<constructor-arg value="JdbcMessageStoreChannelTests" />
 	</bean>
 
 	<service-activator id="service-activator" input-channel="input" output-channel="output" xmlns="http://www.springframework.org/schema/integration">
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java
index 73dbf4bc90..225bf8601d 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java
@@ -58,7 +58,7 @@ public class JdbcMessageStoreChannelTests {
 		input.send(new GenericMessage<String>("foo"));
 		Service.await(10000);
 		assertEquals(1, Service.messages.size());
-		assertEquals(0, messageStore.getMessageGroup("input-queue").size());
+		assertEquals(0, messageStore.getMessageGroup("JdbcMessageStoreChannelTests").size());
 	}
 	
 	@Test
@@ -69,7 +69,7 @@ public class JdbcMessageStoreChannelTests {
 		Service.await(10000);
 		assertEquals(1, Service.messages.size());
 		// After a rollback in the poller the message is still waiting to be delivered
-		assertEquals(1, messageStore.getMessageGroup("input-queue").size());
+		assertEquals(1, messageStore.getMessageGroup("JdbcMessageStoreChannelTests").size());
 	}
 	
 	@Test
@@ -87,7 +87,7 @@ public class JdbcMessageStoreChannelTests {
 		// So no activation
 		assertEquals(0, Service.messages.size());
 		// But inside the transaction the message is still there
-		assertEquals(1, messageStore.getMessageGroup("input-queue").size());
+		assertEquals(1, messageStore.getMessageGroup("JdbcMessageStoreChannelTests").size());
 	}
 	
 	public static class Service {