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

INT-3366 Increase Script Test Timeouts

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3366

Timings are too tight for Travis.

Also fix a JDK8 javadoc problem.
This commit is contained in:
Gary Russell
2014-04-10 16:37:13 -04:00
parent 64a7a7e021
commit e0b567778f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java
View File

@@ -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 <code>1</code>.
* <p/>
* <p>
* Fore more details, please see: http://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked
*
* @author Gunnar Hillert

6
spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java
View File

@@ -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<String>("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<String>("Hello"));
assertEquals("js", outputB.receive(1000).getHeaders().get("TEST_HEADER"));
assertEquals("js", outputB.receive(20000).getHeaders().get("TEST_HEADER"));
}
}

4
spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java
View File

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