From 2150b9b80668e36771953de130c9cbb4b282582c Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Tue, 3 May 2011 17:28:53 +0100
Subject: [PATCH] INT-1789: fix test for Java 5 (duh)

---
 .../jdbc/JdbcMessageStoreChannelIntegrationTests.java         | 3 ++-
 .../integration/monitor/MBeanExporterIntegrationTests.java    | 4 +++-
 .../integration/monitor/excluded-components.xml               | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests.java
index ab03811957..22b9d3697c 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests.java
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.store.MessageGroup;
+import org.springframework.test.annotation.Repeat;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -73,7 +74,6 @@ public class JdbcMessageStoreChannelIntegrationTests {
 	}
 
 	@Test
-	// @Repeat(100)
 	public void testSendAndActivateWithRollback() throws Exception {
 		Service.reset(1);
 		Service.fail = true;
@@ -100,6 +100,7 @@ public class JdbcMessageStoreChannelIntegrationTests {
 	}
 
 	@Test
+	@Repeat(10)
 	public void testTransactionalSendAndReceive() throws Exception {
 
 		Service.reset(1);
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java
index 7942713b46..bddaf3032e 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java
@@ -135,9 +135,11 @@ public class MBeanExporterIntegrationTests {
 		messageChannelsMonitor = context.getBean(IntegrationMBeanExporter.class);
 		assertNotNull(messageChannelsMonitor);
 		MBeanServer server = context.getBean(MBeanServer.class);
-		Set<ObjectName> names = server.queryNames(ObjectName.getInstance("org.springframework.integration:type=*,*"), null);
+		Set<ObjectName> names = server.queryNames(ObjectName.getInstance("org.springframework.integration:type=MessageChannel,*"), null);
 		// Only one registered (out of >2 available)
 		assertEquals(1, names.size());
+		names = server.queryNames(ObjectName.getInstance("org.springframework.integration:type=MessageHandler,*"), null);
+		assertEquals(0, names.size());
 	}
 
 	public static class DateFactoryBean implements FactoryBean<Date> {
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/excluded-components.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/excluded-components.xml
index 8de96bea77..7d7461d725 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/excluded-components.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/excluded-components.xml
@@ -18,6 +18,10 @@
 		<int:queue />
 	</int:channel>
 
+	<int:channel id="output">
+		<int:queue />
+	</int:channel>
+
 	<int:inbound-channel-adapter id="explicit" ref="service" method="execute" channel="input">
 		<int:poller fixed-rate="200" />
 	</int:inbound-channel-adapter>