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

Groovy test: Fix format for MM instead of mm

Browse Source 
https://build.spring.io/browse/INT-AT42SIO-498/

**Cherry-pick to 4.3.x and 4.2.x**
This commit is contained in:
Artem Bilan
2017-05-02 17:31:20 -04:00
parent f03356ccbc
commit 9de2856ae6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
View File

@@ -33,7 +33,7 @@
<service-activator input-channel="inlineScriptInput"> <service-activator input-channel="inlineScriptInput">
<groovy:script customizer="groovyCustomizer" variables="date-ref=date"> <groovy:script customizer="groovyCustomizer" variables="date-ref=date">
<![CDATA[ <![CDATA[
return "inline-$payload : ${date.format('dd.mm.yyyy')}" return "inline-$payload : ${date.format('dd.MM.yyyy')}"
]]> ]]>
</groovy:script> </groovy:script>
</service-activator> </service-activator>
@@ -41,7 +41,7 @@
<service-activator input-channel="scriptWithoutVariablesInput"> <service-activator input-channel="scriptWithoutVariablesInput">
<groovy:script> <groovy:script>
<![CDATA[ <![CDATA[
return "withoutVariables-$payload : ${date.format('dd.mm.yyyy')}" return "withoutVariables-$payload : ${date.format('dd.MM.yyyy')}"
]]> ]]>
</groovy:script> </groovy:script>
</service-activator> </service-activator>

6
spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -148,7 +148,7 @@ public class GroovyServiceActivatorTests {
this.inlineScriptInput.send(message); this.inlineScriptInput.send(message);
} }
DateFormat format = new SimpleDateFormat("dd.mm.yyyy"); DateFormat format = new SimpleDateFormat("dd.MM.yyyy");
String now = format.format(new Date()); String now = format.format(new Date());
@@ -168,7 +168,7 @@ public class GroovyServiceActivatorTests {
this.scriptWithoutVariablesInput.send(message); this.scriptWithoutVariablesInput.send(message);
} }
DateFormat format = new SimpleDateFormat("dd.mm.yyyy"); DateFormat format = new SimpleDateFormat("dd.MM.yyyy");
String now = format.format(new Date()); String now = format.format(new Date());