You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2017/11/19 09:33:30 UTC
[camel] 01/02: Revert "camel-jackson*:
JacksonMarshalDateTimezoneTest: check that requested timezone is available
on the system (VMs on build.apache.org currently do not support the
timezone "Africa/Ouagadougou" used by the test)"
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 01546c881087e5d4067dd71c72f466ffdbd468e5
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Nov 19 10:30:28 2017 +0100
Revert "camel-jackson*: JacksonMarshalDateTimezoneTest: check that requested timezone is available on the system (VMs on build.apache.org currently do not support the timezone "Africa/Ouagadougou" used by the test)"
This reverts commit 084201986774d6306aec3bd3e6fc76cb17c2e210 because it did not work.
---
.../camel/component/jackson/JacksonMarshalDateTimezoneTest.java | 7 +------
.../camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java | 7 +------
2 files changed, 2 insertions(+), 12 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 4bd8420..f621cfd 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
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.jackson;
-import static java.lang.String.format;
-import static org.junit.Assume.assumeTrue;
-
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
@@ -55,9 +52,7 @@ public class JacksonMarshalDateTimezoneTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
JacksonDataFormat format = new JacksonDataFormat();
- String timeZoneId = "Africa/Ouagadougou";
- TimeZone timeZone = TimeZone.getTimeZone(timeZoneId);
- assumeTrue(format("TimeZone with id '%s' is available", timeZoneId), timeZone.getID().equals(timeZoneId));
+ TimeZone timeZone = TimeZone.getTimeZone("Africa/Ouagadougou");
format.setTimezone(timeZone);
from("direct:in").marshal(format).to("mock:result");
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 3003534..847902c 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
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.jacksonxml;
-import static java.lang.String.format;
-import static org.junit.Assume.assumeTrue;
-
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
@@ -55,9 +52,7 @@ public class JacksonMarshalDateTimezoneTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
JacksonXMLDataFormat format = new JacksonXMLDataFormat();
- String timeZoneId = "Africa/Ouagadougou";
- TimeZone timeZone = TimeZone.getTimeZone(timeZoneId);
- assumeTrue(format("TimeZone with id '%s' is available", timeZoneId), timeZone.getID().equals(timeZoneId));
+ TimeZone timeZone = TimeZone.getTimeZone("Africa/Ouagadougou");
format.setTimezone(timeZone);
from("direct:in").marshal(format).to("mock:result");
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.