You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/07 08:56:55 UTC
[1/3] camel git commit: Ignore test that is flaky on CI server and
cmael-quartz is deprecated
Repository: camel
Updated Branches:
refs/heads/master f4907e1bd -> 886e3a9d6
Ignore test that is flaky on CI server and cmael-quartz is deprecated
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d65802f1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d65802f1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d65802f1
Branch: refs/heads/master
Commit: d65802f19fa697348ec62adeb7d19673f77906fd
Parents: f4907e1
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 7 09:22:58 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 7 09:22:58 2017 +0100
----------------------------------------------------------------------
.../SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d65802f1/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
index e1c8ea4..5775e0f 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.util.IOHelper;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.quartz.CronTrigger;
import org.quartz.Scheduler;
@@ -31,6 +32,7 @@ import org.quartz.Trigger;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+@Ignore("Flaky on CI server due DB issue")
public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends TestSupport {
private static AbstractXmlApplicationContext db;
@@ -56,10 +58,8 @@ public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends Test
// the second app before the first one so that the quartz scheduler running
// inside it can be properly shutdown
IOHelper.close(app3, app2, app);
-
}
-
@Test
public void testRestartAppChangeCronExpression() throws Exception {
[3/3] camel git commit: This closes #1505.
Posted by da...@apache.org.
This closes #1505.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/886e3a9d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/886e3a9d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/886e3a9d
Branch: refs/heads/master
Commit: 886e3a9d6d810915d69fc61e268f4d6867e6b015
Parents: e244c33
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 7 09:33:24 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 7 09:33:24 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e244c33e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e244c33e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e244c33e
Branch: refs/heads/master
Commit: e244c33e3dbcc7efcf0b3b6bc3d30ba362434cb3
Parents: d65802f
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 7 09:31:44 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 7 09:31:44 2017 +0100
----------------------------------------------------------------------
.../camel/component/rest/FromRestDefaultValueTest.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e244c33e/camel-core/src/test/java/org/apache/camel/component/rest/FromRestDefaultValueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestDefaultValueTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestDefaultValueTest.java
index 14ce5e5..47cd6c1 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestDefaultValueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestDefaultValueTest.java
@@ -31,15 +31,22 @@ public class FromRestDefaultValueTest extends ContextTestSupport {
}
public void testDefaultValue() throws Exception {
- // the rest becomes routes and the input is a seda endpoint created by the DummyRestConsumerFactory
+ getMockEndpoint("mock:bye").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bye").expectedHeaderReceived("kind", "customer");
+
+ // the rest becomes routes and the input is a seda endpoint created by the DummyRestConsumerFactory
template.sendBody("seda:get-say-bye", "Hello World");
- assertMockEndpointsSatisfied();
- resetMocks();
+ assertMockEndpointsSatisfied();
+ }
+ public void testDefaultValueOverride() throws Exception {
+ getMockEndpoint("mock:bye").expectedBodiesReceived("Bye World");
getMockEndpoint("mock:bye").expectedHeaderReceived("kind", "admin");
+
+ // the rest becomes routes and the input is a seda endpoint created by the DummyRestConsumerFactory
template.sendBodyAndHeader("seda:get-say-bye", "Bye World", "kind", "admin");
+
assertMockEndpointsSatisfied();
}