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

Upgrade to SF-4.2.1.RELEASE

Browse Source 
Increase `refreshTimeout` for `GroovyScriptExecutingMessageProcessorTests`
to avoid timing issue for the first `Thread.sleep(20)`
This commit is contained in:
Artem Bilan
2015-09-01 21:07:44 -04:00
parent c86141cff7
commit f26bfd5b33
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -139,7 +139,7 @@ subprojects { subproject ->
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '4.0.2.RELEASE'
springSocialTwitterVersion = '1.1.0.RELEASE'
springRetryVersion = '1.1.2.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.1.BUILD-SNAPSHOT'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.1.RELEASE'
springWsVersion = '2.2.2.RELEASE'
xmlUnitVersion = '1.5'
xstreamVersion = '1.4.7'

9
spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.integration.groovy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import groovy.lang.Script;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -46,6 +45,8 @@ import org.springframework.scripting.support.ResourceScriptSource;
import org.springframework.scripting.support.StaticScriptSource;
import org.springframework.test.annotation.Repeat;
import groovy.lang.Script;
/**
* @author Mark Fisher
* @author Dave Syer
@@ -127,7 +128,7 @@ public class GroovyScriptExecutingMessageProcessorTests {
String script = "return \"payload is $payload, header is $headers.testHeader\"";
Message<?> message = MessageBuilder.withPayload("foo").setHeader("testHeader", "bar").build();
TestResource resource = new TestResource(script, "simpleTest");
ScriptSource scriptSource = new RefreshableResourceScriptSource(resource, 1000L);
ScriptSource scriptSource = new RefreshableResourceScriptSource(resource, 2000L);
MessageProcessor<Object> processor = new GroovyScriptExecutingMessageProcessor(scriptSource);
// should be the original script
Object result = processor.processMessage(message);
@@ -139,7 +140,7 @@ public class GroovyScriptExecutingMessageProcessorTests {
result = processor.processMessage(message);
assertEquals("payload is foo, header is bar", result.toString());
// sleep some more, past refresh time
Thread.sleep(1000L);
Thread.sleep(2000L);
// now you go the new script
resource.setScript("return \"payload is $payload\"");
result = processor.processMessage(message);