You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/11/20 08:57:45 UTC
[camel] branch master updated (73509b8 -> 5bae560)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 73509b8 Upgrade MockWebserver to version 0.0.17
new 18484ef Fixed Test JacksonMarshalDateTimezoneTest in camel-jackson
new 5bae560 Fixed Test JacksonMarshalDateTimezoneTest in camel-jacksonxml
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/jackson/JacksonMarshalDateTimezoneTest.java | 6 ++++--
.../camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].
[camel] 02/02: Fixed Test JacksonMarshalDateTimezoneTest in
camel-jacksonxml
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5bae5600289141e6d23a28ce9e6b809f79b8ccf1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 20 09:57:27 2017 +0100
Fixed Test JacksonMarshalDateTimezoneTest in camel-jacksonxml
---
.../camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java
index 740b8aa..125d2f3 100644
--- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java
+++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java
@@ -29,14 +29,15 @@ public class JacksonMarshalDateTimezoneTest extends CamelTestSupport {
@Test
public void testMarshalDate() throws Exception {
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
GregorianCalendar in = new GregorianCalendar(2017, Calendar.APRIL, 25, 17, 0, 10);
MockEndpoint mock = getMockEndpoint("mock:result");
Object marshalled = template.requestBody("direct:in", in.getTime());
String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
- assertEquals("<Date>1493132410000</Date>", marshalledAsString);
-
+ assertEquals("<Date>1493139610000</Date>", marshalledAsString);
+
mock.expectedMessageCount(1);
mock.assertIsSatisfied();
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.
[camel] 01/02: Fixed Test JacksonMarshalDateTimezoneTest in
camel-jackson
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 18484ef2f905ca26033ef17979d2b4acfbe9e851
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 20 09:54:55 2017 +0100
Fixed Test JacksonMarshalDateTimezoneTest in camel-jackson
---
.../camel/component/jackson/JacksonMarshalDateTimezoneTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java
index 30457e8..26a0b81 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java
@@ -25,18 +25,20 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+
public class JacksonMarshalDateTimezoneTest extends CamelTestSupport {
@Test
public void testMarshalDate() throws Exception {
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
GregorianCalendar in = new GregorianCalendar(2017, Calendar.APRIL, 25, 17, 0, 10);
MockEndpoint mock = getMockEndpoint("mock:result");
Object marshalled = template.requestBody("direct:in", in.getTime());
String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
- assertEquals("1493132410000", marshalledAsString);
-
+ assertEquals("1493139610000", marshalledAsString);
+
mock.expectedMessageCount(1);
mock.assertIsSatisfied();
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.