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:29 UTC
[camel] branch master updated (9087c10 -> 8ffe4b5)
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 9087c10 CAMEL-11869: Removed unused mockito-core dependency and others as well
new 01546c8 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)"
new 8ffe4b5 Revert "camel-jackson*: JacksonMarshalDateTimezoneTest: force tests to be run with the junit 4 runner, so assumptions work when test is run by maven"
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:
.../component/jackson/JacksonMarshalDateTimezoneTest.java | 10 +---------
.../component/jacksonxml/JacksonMarshalDateTimezoneTest.java | 10 +---------
2 files changed, 2 insertions(+), 18 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].
[camel] 02/02: Revert "camel-jackson*:
JacksonMarshalDateTimezoneTest: force tests to be run with the junit 4
runner, so assumptions work when test is run by maven"
Posted by pa...@apache.org.
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 8ffe4b52727549b516ae49ce5ad33d88c1353288
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Nov 19 10:31:09 2017 +0100
Revert "camel-jackson*: JacksonMarshalDateTimezoneTest: force tests to be run with the junit 4 runner, so assumptions work when test is run by maven"
This reverts commit ade3159e066cc438527ecb7aa20208362a5859a2 because it did not work.
---
.../apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java | 3 ---
.../camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java | 3 ---
2 files changed, 6 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 f621cfd..30457e8 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
@@ -24,10 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-@RunWith(JUnit4.class) // force use of JUnit4 so assumptions work
public class JacksonMarshalDateTimezoneTest extends CamelTestSupport {
@Test
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 847902c..740b8aa 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
@@ -24,10 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-@RunWith(JUnit4.class) // force use of JUnit4 so assumptions work
public class JacksonMarshalDateTimezoneTest extends CamelTestSupport {
@Test
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.
[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)"
Posted by pa...@apache.org.
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>.