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 2019/05/21 07:53:51 UTC
[camel] branch master updated (4c040c6 -> 7466aa5)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4c040c6 CAMEL-13456 (#2935)
new 2a5e6e2 CAMEL-13549: Added unit test
new 7466aa5 Regen
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:
components/readme.adoc | 2 +-
.../apache/camel/component/mock/MockEndpointTest.java | 17 +++++++++++++++++
...IssueTest.java => MockExpectedHeadersIssueTest.java} | 2 +-
.../modules/ROOT/pages/controlbus-component.adoc | 2 +-
.../components/modules/ROOT/pages/pulsar-component.adoc | 4 ++--
.../components-starter/camel-jira-starter/pom.xml | 2 --
6 files changed, 22 insertions(+), 7 deletions(-)
rename core/camel-core/src/test/java/org/apache/camel/issues/{MockExepctedHeadersIssueTest.java => MockExpectedHeadersIssueTest.java} (97%)
[camel] 01/02: CAMEL-13549: Added unit test
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2a5e6e24615426a10eab1022ce4d1f9ee4541360
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 21 09:34:47 2019 +0200
CAMEL-13549: Added unit test
---
.../apache/camel/component/mock/MockEndpointTest.java | 17 +++++++++++++++++
...IssueTest.java => MockExpectedHeadersIssueTest.java} | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
index 8ebc2e5..ac8c3e4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
@@ -572,6 +572,23 @@ public class MockEndpointTest extends ContextTestSupport {
}
@Test
+ public void testHeaderNoMessageSent() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedHeaderReceived("foo", 123);
+ // just wait a little bit as we dont want to wait 10 seconds (default)
+ mock.setResultWaitTime(5);
+
+ // do not send any message
+
+ try {
+ mock.assertIsSatisfied();
+ fail("Should fail");
+ } catch (AssertionError e) {
+ assertEquals("mock://result Received message count 0, expected at least 1", e.getMessage());
+ }
+ }
+
+ @Test
public void testHeaderInvalidValue() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/MockExepctedHeadersIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeadersIssueTest.java
similarity index 97%
rename from core/camel-core/src/test/java/org/apache/camel/issues/MockExepctedHeadersIssueTest.java
rename to core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeadersIssueTest.java
index a5fee58..c62e2a5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/MockExepctedHeadersIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeadersIssueTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class MockExepctedHeadersIssueTest extends ContextTestSupport {
+public class MockExpectedHeadersIssueTest extends ContextTestSupport {
@Test
public void testHeaders() throws Exception {
[camel] 02/02: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7466aa57abf9ca860755191e84cb2e6bc4922bd6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 21 09:53:05 2019 +0200
Regen
---
components/readme.adoc | 2 +-
docs/components/modules/ROOT/pages/controlbus-component.adoc | 2 +-
docs/components/modules/ROOT/pages/pulsar-component.adoc | 4 ++--
platforms/spring-boot/components-starter/camel-jira-starter/pom.xml | 2 --
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index 3cacab1..86e7a55 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -23,7 +23,7 @@ Number of Components: 296 in 233 JAR artifacts (0 deprecated)
`flink:endpointType` | 2.18 | The flink component can be used to send DataSet jobs to Apache Flink cluster.
| link:camel-pulsar/src/main/docs/pulsar-component.adoc[Apache Pulsar] (camel-pulsar) +
-`pulsar:persistence://tenant/namespace/topic` | | Camel Apache Pulsar Component
+`pulsar:persistence://tenant/namespace/topic` | 2.24 | Camel Apache Pulsar Component
| link:camel-spark/src/main/docs/spark-component.adoc[Apache Spark] (camel-spark) +
`spark:endpointType` | 2.17 | The spark component can be used to send RDD or DataFrame jobs to Apache Spark cluster.
diff --git a/docs/components/modules/ROOT/pages/controlbus-component.adoc b/docs/components/modules/ROOT/pages/controlbus-component.adoc
index 96c273a..55f4853 100644
--- a/docs/components/modules/ROOT/pages/controlbus-component.adoc
+++ b/docs/components/modules/ROOT/pages/controlbus-component.adoc
@@ -8,7 +8,7 @@ EIP patterns allows for the
integration system to be monitored and managed from within the
framework.
-image:images/controlbus-component.data/ControlBus.gif[image]
+image:ControlBus.gif[image]
Use a Control Bus to manage an enterprise integration system. The
Control Bus uses the same messaging mechanism used by the application
diff --git a/docs/components/modules/ROOT/pages/pulsar-component.adoc b/docs/components/modules/ROOT/pages/pulsar-component.adoc
index 10ef1a4..4decdeb 100644
--- a/docs/components/modules/ROOT/pages/pulsar-component.adoc
+++ b/docs/components/modules/ROOT/pages/pulsar-component.adoc
@@ -1,7 +1,7 @@
[[pulsar-component]]
== Apache Pulsar Component
-*Available as of Camel version *
+*Available as of Camel version 2.24*
Maven users will need to add the following dependency to
@@ -111,4 +111,4 @@ The component supports 4 options, which are listed below.
| *camel.component.pulsar.pulsar-client* | The pulsar client. The option is a org.apache.pulsar.client.api.PulsarClient type. | | String
| *camel.component.pulsar.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
|===
-// spring-boot-auto-configure options: END
+// spring-boot-auto-configure options: END
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml
index f0e29d4..2e669e8 100644
--- a/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml
@@ -58,12 +58,10 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
-
<repositories>
<repository>
<id>atlassian-public</id>
<url>https://packages.atlassian.com/maven-external</url>
</repository>
</repositories>
-
</project>