Skip to content

Commit f166bd1

Browse files
committed
Groovy test: Fix format for MM instead of mm
https://build.spring.io/browse/INT-AT42SIO-498/ **Cherry-pick to 4.3.x and 4.2.x** (cherry picked from commit 9de2856) Conflicts: spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
1 parent 1a344bb commit f166bd1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
<service-activator input-channel="inlineScriptInput">
3434
<groovy:script customizer="groovyCustomizer" variables="date-ref=date">
3535
<![CDATA[
36-
return "inline-$payload : ${date.format('dd.mm.yyyy')}"
36+
return "inline-$payload : ${date.format('dd.MM.yyyy')}"
3737
]]>
3838
</groovy:script>
3939
</service-activator>
4040

4141
<service-activator input-channel="scriptWithoutVariablesInput">
4242
<groovy:script>
4343
<![CDATA[
44-
return "withoutVariables-$payload : ${date.format('dd.mm.yyyy')}"
44+
return "withoutVariables-$payload : ${date.format('dd.MM.yyyy')}"
4545
]]>
4646
</groovy:script>
4747
</service-activator>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -148,7 +148,7 @@ public void inlineScript() throws Exception {
148148
this.inlineScriptInput.send(message);
149149
}
150150

151-
DateFormat format = new SimpleDateFormat("dd.mm.yyyy");
151+
DateFormat format = new SimpleDateFormat("dd.MM.yyyy");
152152

153153
String now = format.format(new Date());
154154

@@ -168,7 +168,7 @@ public void testScriptWithoutVariables() throws Exception {
168168
this.scriptWithoutVariablesInput.send(message);
169169
}
170170

171-
DateFormat format = new SimpleDateFormat("dd.mm.yyyy");
171+
DateFormat format = new SimpleDateFormat("dd.MM.yyyy");
172172

173173
String now = format.format(new Date());
174174

0 commit comments

Comments
 (0)