Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1789: fix test for Java 5 (duh)

Browse Source
This commit is contained in:
Dave Syer
2011-05-03 17:28:53 +01:00
parent fdc5862e44
commit 2150b9b806
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelIntegrationTests.java
View File

@@ -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);

4
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java
View File

@@ -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> {

4
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/excluded-components.xml
View File

@@ -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>