From e0b567778fd5e2829d0772fd70a11bb85841c1fa Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 10 Apr 2014 16:37:13 -0400 Subject: [PATCH] INT-3366 Increase Script Test Timeouts JIRA: https://jira.spring.io/browse/INT-3366 Timings are too tight for Travis. Also fix a JDK8 javadoc problem. --- .../channel/OracleChannelMessageStoreQueryProvider.java | 2 +- .../scripting/config/jsr223/Jsr223HeaderEnricherTests.java | 6 +++--- .../config/jsr223/Jsr223InboundChannelAdapterTests.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java index b31eb41821..7ee915ebc9 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java @@ -18,7 +18,7 @@ import org.springframework.jdbc.core.JdbcTemplate; /** * Contains Oracle-specific queries for the {@link JdbcChannelMessageStore}. * Please ensure that the used {@link JdbcTemplate}'s fetchSize property is 1. - *

+ *

* Fore more details, please see: http://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked * * @author Gunnar Hillert diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java index f679da894f..8bf813ea5b 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -53,12 +53,12 @@ public class Jsr223HeaderEnricherTests { @Test public void referencedScript() throws Exception{ inputA.send(new GenericMessage("Hello")); - assertEquals("jruby", outputA.receive(1000).getHeaders().get("TEST_HEADER")); + assertEquals("jruby", outputA.receive(20000).getHeaders().get("TEST_HEADER")); } @Test public void inlineScript() throws Exception{ inputB.send(new GenericMessage("Hello")); - assertEquals("js", outputB.receive(1000).getHeaders().get("TEST_HEADER")); + assertEquals("js", outputB.receive(20000).getHeaders().get("TEST_HEADER")); } } diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java index ddf42d7945..ae4ee2a24b 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java @@ -49,14 +49,14 @@ public class Jsr223InboundChannelAdapterTests { @Test public void testInt2867InboundChannelAdapter() throws Exception { - Message message = this.inboundChannelAdapterChannel.receive(2000); + Message message = this.inboundChannelAdapterChannel.receive(20000); assertNotNull(message); Object payload = message.getPayload(); assertThat(payload, Matchers.instanceOf(Date.class)); assertTrue(((Date) payload).before(new Date())); assertEquals("bar", message.getHeaders().get("foo")); - message = this.inboundChannelAdapterChannel.receive(1000); + message = this.inboundChannelAdapterChannel.receive(20000); assertNotNull(message); message = this.inboundChannelAdapterChannel.receive(10);