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/15 20:00:56 UTC

[camel] branch master updated (8f79c86 -> ade3159)

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 8f79c86  fix typo
     new b4898e5  camel-websocket: WebsocketEndpointConfigurationTest#testSetServletThreadPool: try to make test pass on build.apache.org by increasing maximum threads from 20 to 25
     new ade3159  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:
 .../apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java | 3 +++
 .../camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java     | 3 +++
 .../camel/component/websocket/WebsocketEndpointConfigurationTest.java  | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].

[camel] 02/02: 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 ade3159e066cc438527ecb7aa20208362a5859a2
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Wed Nov 15 21:00:17 2017 +0100

    camel-jackson*: JacksonMarshalDateTimezoneTest: force tests to be run with the junit 4 runner, so assumptions work when test is run by maven
---
 .../apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java | 3 +++
 .../camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java     | 3 +++
 2 files changed, 6 insertions(+)

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 6981967..4bd8420 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
@@ -27,7 +27,10 @@ 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 c7cf331..3003534 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
@@ -27,7 +27,10 @@ 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: camel-websocket: WebsocketEndpointConfigurationTest#testSetServletThreadPool: try to make test pass on build.apache.org by increasing maximum threads from 20 to 25

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 b4898e5bdc54dc919806dfbfbd000825ad3e4dd0
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Wed Nov 15 20:51:16 2017 +0100

    camel-websocket: WebsocketEndpointConfigurationTest#testSetServletThreadPool: try to make test pass on build.apache.org by increasing maximum threads from 20 to 25
---
 .../camel/component/websocket/WebsocketEndpointConfigurationTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
index 503f7b6..7e4beaf 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
@@ -108,7 +108,7 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
         String uri = "websocket://localhost:" + port + "/bar?bufferSize=25000&maxIdleTime=3000";
         WebsocketEndpoint websocketEndpoint = (WebsocketEndpoint)context.getEndpoint(uri);
         WebsocketComponent component = websocketEndpoint.getComponent();
-        QueuedThreadPool qtp = new QueuedThreadPool(20, 1);
+        QueuedThreadPool qtp = new QueuedThreadPool(25, 1);
         component.setThreadPool(qtp);
         Consumer consumer = websocketEndpoint.createConsumer(processor);
         component.connect((WebsocketProducerConsumer) consumer);

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.