You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/10/08 07:30:58 UTC
[camel] branch CAMEL-13965 updated (e90f5cf -> db134cd)
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a change to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git.
omit e90f5cf CAMEL-14037: Created camel-testcontainers-junit5 from camel-test-containers
add 7393d10 CAMEL-14041: scheduled poll consumer - Add option to limit number of polls
add bce1032 update column sizing to include third column (#3228)
add 58603c5 CAMEL-13392 camel-bindy - Add allowEmptyStream option (#3227)
add 481662f CAMEL-14036 - Added a link to configuring routes startup to user manual
add 07940f0 CAMEL-14037: Created camel-testcontainers-junit5 from camel-test-containers
new db134cd CAMEL-14037: Migrated camel-consul to camel-testcontainers-junit5
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e90f5cf)
\
N -- N -- N refs/heads/CAMEL-13965 (db134cd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.../camel-apns/src/main/docs/apns-component.adoc | 3 ++-
.../src/main/docs/as2-component.adoc | 3 ++-
.../camel-atom/src/main/docs/atom-component.adoc | 3 ++-
.../src/main/docs/aws-ddbstream-component.adoc | 3 ++-
.../src/main/docs/aws-kinesis-component.adoc | 3 ++-
.../src/main/docs/aws-s3-component.adoc | 3 ++-
.../src/main/docs/aws-sqs-component.adoc | 3 ++-
.../src/main/docs/beanstalk-component.adoc | 3 ++-
.../src/main/docs/bindy-dataformat.adoc | 8 +++++--
.../dataformat/bindy/BindyAbstractDataFormat.java | 9 +++++++
.../dataformat/bindy/csv/BindyCsvDataFormat.java | 2 +-
.../bindy/fixed/BindyFixedLengthDataFormat.java | 2 +-
.../bindy/kvp/BindyKeyValuePairDataFormat.java | 2 +-
... BindyComplexCsvUnmarshallEmptyStreamTest.java} | 19 +++++++--------
...omplexCsvUnmarshallEmptyStreamTest-context.xml} | 2 +-
.../src/main/docs/box-component.adoc | 3 ++-
.../src/main/docs/braintree-component.adoc | 3 ++-
.../src/main/docs/cql-component.adoc | 3 ++-
components/camel-consul/pom.xml | 10 ++++++++
.../camel/component/consul/ConsulCatalogTest.java | 16 ++++++-------
.../component/consul/ConsulClientKeyValueTest.java | 5 +++-
.../component/consul/ConsulCoordinatesTest.java | 20 ++++++++--------
.../camel/component/consul/ConsulEventTest.java | 6 ++++-
.../component/consul/ConsulEventWatchTest.java | 2 +-
.../camel/component/consul/ConsulHealthTest.java | 12 ++++++----
.../camel/component/consul/ConsulKeyValueTest.java | 5 +++-
.../component/consul/ConsulKeyValueWatchTest.java | 2 +-
.../camel/component/consul/ConsulRegistryTest.java | 21 ++++++++--------
.../component/consul/ConsulRegistryUtilsTest.java | 6 ++---
.../camel/component/consul/ConsulSessionTest.java | 18 +++++++-------
.../camel/component/consul/ConsulTestSupport.java | 11 +++------
.../cloud/ConsulDefaultServiceCallRouteTest.java | 2 +-
.../cloud/ConsulRibbonServiceCallRouteTest.java | 2 +-
.../ConsulServiceCallWithRegistrationTest.java | 10 ++++----
.../consul/cloud/ConsulServiceDiscoveryTest.java | 5 +++-
.../cloud/ConsulServiceRegistrationTestBase.java | 5 +++-
.../consul/cloud/ConsulServiceRegistryTest.java | 4 +++-
.../src/main/docs/couchbase-component.adoc | 3 ++-
.../camel-elsql/src/main/docs/elsql-component.adoc | 3 ++-
.../camel-etcd/src/main/docs/etcd-component.adoc | 3 ++-
.../src/main/docs/fhir-component.adoc | 3 ++-
.../camel-file/src/main/docs/file-component.adoc | 3 ++-
.../src/main/docs/flatpack-component.adoc | 3 ++-
.../camel-ftp/src/main/docs/ftp-component.adoc | 3 ++-
.../camel-ftp/src/main/docs/ftps-component.adoc | 3 ++-
.../camel-ftp/src/main/docs/sftp-component.adoc | 3 ++-
.../src/main/docs/google-calendar-component.adoc | 3 ++-
.../docs/google-calendar-stream-component.adoc | 3 ++-
.../src/main/docs/google-drive-component.adoc | 3 ++-
.../src/main/docs/google-mail-component.adoc | 3 ++-
.../main/docs/google-mail-stream-component.adoc | 3 ++-
.../src/main/docs/google-sheets-component.adoc | 3 ++-
.../main/docs/google-sheets-stream-component.adoc | 3 ++-
.../camel-hdfs/src/main/docs/hdfs-component.adoc | 3 ++-
.../src/main/docs/hipchat-component.adoc | 3 ++-
.../src/main/docs/ironmq-component.adoc | 3 ++-
.../camel-jooq/src/main/docs/jooq-component.adoc | 3 ++-
.../camel-jpa/src/main/docs/jpa-component.adoc | 3 ++-
.../camel-jt400/src/main/docs/jt400-component.adoc | 3 ++-
.../src/main/docs/linkedin-component.adoc | 3 ++-
.../camel-mail/src/main/docs/mail-component.adoc | 3 ++-
.../src/main/docs/mybatis-component.adoc | 3 ++-
.../src/main/docs/olingo2-component.adoc | 3 ++-
.../src/main/docs/olingo4-component.adoc | 3 ++-
.../main/docs/pg-replication-slot-component.adoc | 3 ++-
.../src/main/docs/robotframework-component.adoc | 5 ++--
.../camel-rss/src/main/docs/rss-component.adoc | 3 ++-
.../src/main/docs/xquery-component.adoc | 3 ++-
.../src/main/docs/scheduler-component.adoc | 3 ++-
.../camel-slack/src/main/docs/slack-component.adoc | 3 ++-
.../camel-snmp/src/main/docs/snmp-component.adoc | 3 ++-
.../src/main/docs/splunk-component.adoc | 3 ++-
.../camel-sql/src/main/docs/sql-component.adoc | 3 ++-
.../camel-ssh/src/main/docs/ssh-component.adoc | 3 ++-
.../src/main/docs/telegram-component.adoc | 3 ++-
.../apache/camel/test/junit5/CamelTestSupport.java | 7 ++++++
.../src/main/docs/twilio-component.adoc | 3 ++-
.../main/docs/twitter-directmessage-component.adoc | 3 ++-
.../src/main/docs/twitter-search-component.adoc | 3 ++-
.../src/main/docs/twitter-timeline-component.adoc | 3 ++-
.../src/main/docs/weather-component.adoc | 3 ++-
.../src/main/docs/yammer-component.adoc | 3 ++-
.../src/main/docs/zendesk-component.adoc | 3 ++-
.../camel/model/dataformat/BindyDataFormat.java | 15 ++++++++++++
.../reifier/dataformat/BindyDataFormatReifier.java | 3 +++
.../SchedulerRepeatCountTest.java} | 16 ++++++-------
.../endpoint/dsl/AS2EndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/ApnsEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/BeanstalkEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/BoxEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/BraintreeEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/CassandraEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/CouchbaseEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/ElsqlEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/EtcdEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/FhirEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/FileEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/FlatpackEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/FtpEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/FtpsEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/GoogleCalendarEndpointBuilderFactory.java | 28 ++++++++++++++++++++++
.../dsl/GoogleDriveEndpointBuilderFactory.java | 27 +++++++++++++++++++++
.../dsl/GoogleMailEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/GoogleSheetsEndpointBuilderFactory.java | 27 +++++++++++++++++++++
.../endpoint/dsl/HdfsEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/HipchatEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/IronMQEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/JooqEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/JpaEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/Jt400EndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/KinesisEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/LinkedInEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/MailEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/MyBatisEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/Olingo2EndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/Olingo4EndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/RobotFrameworkEndpointBuilderFactory.java | 28 ++++++++++++++++++++++
.../endpoint/dsl/S3EndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/SftpEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/SlackEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/SnmpEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/SplunkEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/SqlEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/SqsEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/SshEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/TelegramEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/TwilioEndpointBuilderFactory.java | 26 ++++++++++++++++++++
...TwitterDirectMessageEndpointBuilderFactory.java | 28 ++++++++++++++++++++++
.../dsl/TwitterSearchEndpointBuilderFactory.java | 28 ++++++++++++++++++++++
.../dsl/TwitterTimelineEndpointBuilderFactory.java | 28 ++++++++++++++++++++++
.../dsl/WeatherEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/XQueryEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../endpoint/dsl/YammerEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../dsl/ZendeskEndpointBuilderFactory.java | 26 ++++++++++++++++++++
.../mbean/ManagedSchedulePollConsumerMBean.java | 6 +++++
.../mbean/ManagedScheduledPollConsumer.java | 10 ++++++++
.../camel/support/ScheduledPollConsumer.java | 25 +++++++++++++++++--
.../camel/support/ScheduledPollEndpoint.java | 19 +++++++++++++++
.../modules/ROOT/pages/apns-component.adoc | 3 ++-
.../modules/ROOT/pages/as2-component.adoc | 3 ++-
.../modules/ROOT/pages/atom-component.adoc | 3 ++-
.../ROOT/pages/aws-ddbstream-component.adoc | 3 ++-
.../modules/ROOT/pages/aws-kinesis-component.adoc | 3 ++-
.../modules/ROOT/pages/aws-s3-component.adoc | 3 ++-
.../modules/ROOT/pages/aws-sqs-component.adoc | 3 ++-
.../modules/ROOT/pages/beanstalk-component.adoc | 3 ++-
.../modules/ROOT/pages/bindy-dataformat.adoc | 8 +++++--
.../modules/ROOT/pages/box-component.adoc | 3 ++-
.../modules/ROOT/pages/braintree-component.adoc | 3 ++-
.../modules/ROOT/pages/couchbase-component.adoc | 3 ++-
.../modules/ROOT/pages/cql-component.adoc | 3 ++-
.../modules/ROOT/pages/elsql-component.adoc | 3 ++-
.../modules/ROOT/pages/etcd-component.adoc | 3 ++-
.../modules/ROOT/pages/fhir-component.adoc | 3 ++-
.../modules/ROOT/pages/file-component.adoc | 3 ++-
.../modules/ROOT/pages/flatpack-component.adoc | 3 ++-
.../modules/ROOT/pages/ftp-component.adoc | 3 ++-
.../modules/ROOT/pages/ftps-component.adoc | 3 ++-
.../ROOT/pages/google-calendar-component.adoc | 3 ++-
.../pages/google-calendar-stream-component.adoc | 3 ++-
.../modules/ROOT/pages/google-drive-component.adoc | 3 ++-
.../modules/ROOT/pages/google-mail-component.adoc | 3 ++-
.../ROOT/pages/google-mail-stream-component.adoc | 3 ++-
.../ROOT/pages/google-sheets-component.adoc | 3 ++-
.../ROOT/pages/google-sheets-stream-component.adoc | 3 ++-
.../modules/ROOT/pages/hdfs-component.adoc | 3 ++-
.../modules/ROOT/pages/hipchat-component.adoc | 3 ++-
.../modules/ROOT/pages/ironmq-component.adoc | 3 ++-
.../modules/ROOT/pages/jooq-component.adoc | 3 ++-
.../modules/ROOT/pages/jpa-component.adoc | 3 ++-
.../modules/ROOT/pages/jt400-component.adoc | 3 ++-
.../modules/ROOT/pages/linkedin-component.adoc | 3 ++-
.../modules/ROOT/pages/mail-component.adoc | 3 ++-
.../modules/ROOT/pages/mybatis-component.adoc | 3 ++-
.../modules/ROOT/pages/olingo2-component.adoc | 3 ++-
.../modules/ROOT/pages/olingo4-component.adoc | 3 ++-
.../ROOT/pages/pg-replication-slot-component.adoc | 3 ++-
.../ROOT/pages/robotframework-component.adoc | 5 ++--
.../modules/ROOT/pages/rss-component.adoc | 3 ++-
.../modules/ROOT/pages/scheduler-component.adoc | 3 ++-
.../modules/ROOT/pages/sftp-component.adoc | 3 ++-
.../modules/ROOT/pages/slack-component.adoc | 3 ++-
.../modules/ROOT/pages/snmp-component.adoc | 3 ++-
.../modules/ROOT/pages/splunk-component.adoc | 3 ++-
.../modules/ROOT/pages/sql-component.adoc | 3 ++-
.../modules/ROOT/pages/ssh-component.adoc | 3 ++-
.../modules/ROOT/pages/telegram-component.adoc | 3 ++-
.../modules/ROOT/pages/twilio-component.adoc | 3 ++-
.../pages/twitter-directmessage-component.adoc | 3 ++-
.../ROOT/pages/twitter-search-component.adoc | 3 ++-
.../ROOT/pages/twitter-timeline-component.adoc | 3 ++-
.../modules/ROOT/pages/weather-component.adoc | 3 ++-
.../modules/ROOT/pages/xquery-component.adoc | 3 ++-
.../modules/ROOT/pages/yammer-component.adoc | 3 ++-
.../modules/ROOT/pages/zendesk-component.adoc | 3 ++-
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
.../modules/ROOT/pages/route-policy.adoc | 2 +-
.../BindyCsvDataFormatConfiguration.java | 13 ++++++++++
.../BindyFixedLengthDataFormatConfiguration.java | 13 ++++++++++
.../BindyKeyValuePairDataFormatConfiguration.java | 13 ++++++++++
200 files changed, 1747 insertions(+), 211 deletions(-)
copy components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/{BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java => BindyComplexCsvUnmarshallEmptyStreamTest.java} (77%)
copy components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/csv/{BindyComplexCsvUnmarshallTest-context.xml => BindyComplexCsvUnmarshallEmptyStreamTest-context.xml} (95%)
copy core/camel-core/src/test/java/org/apache/camel/component/{timer/TimerDelayTest.java => scheduler/SchedulerRepeatCountTest.java} (77%)
[camel] 01/01: CAMEL-14037: Migrated camel-consul to
camel-testcontainers-junit5
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db134cd13b1ac22275ee2d3b091c5375535fdd46
Author: aldettinger <al...@gmail.com>
AuthorDate: Sat Oct 5 17:26:40 2019 +0200
CAMEL-14037: Migrated camel-consul to camel-testcontainers-junit5
---
components/camel-consul/pom.xml | 10 ++++++++++
.../camel/component/consul/ConsulCatalogTest.java | 16 ++++++++--------
.../component/consul/ConsulClientKeyValueTest.java | 5 ++++-
.../component/consul/ConsulCoordinatesTest.java | 20 ++++++++++----------
.../camel/component/consul/ConsulEventTest.java | 6 +++++-
.../component/consul/ConsulEventWatchTest.java | 2 +-
.../camel/component/consul/ConsulHealthTest.java | 12 +++++++-----
.../camel/component/consul/ConsulKeyValueTest.java | 5 ++++-
.../component/consul/ConsulKeyValueWatchTest.java | 2 +-
.../camel/component/consul/ConsulRegistryTest.java | 21 +++++++++++----------
.../component/consul/ConsulRegistryUtilsTest.java | 6 +++---
.../camel/component/consul/ConsulSessionTest.java | 18 +++++++++---------
.../camel/component/consul/ConsulTestSupport.java | 11 +++--------
.../cloud/ConsulDefaultServiceCallRouteTest.java | 2 +-
.../cloud/ConsulRibbonServiceCallRouteTest.java | 2 +-
.../ConsulServiceCallWithRegistrationTest.java | 10 ++++++----
.../consul/cloud/ConsulServiceDiscoveryTest.java | 5 ++++-
.../cloud/ConsulServiceRegistrationTestBase.java | 5 ++++-
.../consul/cloud/ConsulServiceRegistryTest.java | 4 +++-
.../apache/camel/test/junit5/CamelTestSupport.java | 7 +++++++
20 files changed, 102 insertions(+), 67 deletions(-)
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index c17d1a4..65eef4f 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -55,6 +55,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java
index d96305b..097daec 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java
@@ -21,8 +21,8 @@ import java.util.List;
import com.orbitz.consul.model.health.Node;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulCatalogActions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class ConsulCatalogTest extends ConsulTestSupport {
@@ -34,9 +34,9 @@ public class ConsulCatalogTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
@Test
@@ -47,9 +47,9 @@ public class ConsulCatalogTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
@Override
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
index ef6cc27..749c22f 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulClientKeyValueTest extends ConsulTestSupport {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java
index 1b9d280..fc8a855 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java
@@ -22,9 +22,9 @@ import com.orbitz.consul.model.coordinate.Coordinate;
import com.orbitz.consul.model.coordinate.Datacenter;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulCoordinatesActions;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class ConsulCoordinatesTest extends ConsulTestSupport {
@@ -36,12 +36,12 @@ public class ConsulCoordinatesTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
- @Ignore("Disabled as it seems that nodes is always 0")
+ @Disabled("Disabled as it seems that nodes is always 0")
@Test
public void testNodes() throws Exception {
List<Coordinate> ref = getConsul().coordinateClient().getNodes();
@@ -50,9 +50,9 @@ public class ConsulCoordinatesTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
@Override
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java
index 6daed84..c2f4d51 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java
@@ -23,7 +23,11 @@ import com.orbitz.consul.model.event.Event;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulEventActions;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulEventTest extends ConsulTestSupport {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
index 8550295..b546e1c 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import com.orbitz.consul.EventClient;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsulEventWatchTest extends ConsulTestSupport {
private String key;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java
index 79e2cfe..2f6c9ef 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java
@@ -27,8 +27,10 @@ import com.orbitz.consul.model.agent.Registration;
import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulHealthActions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulHealthTest extends ConsulTestSupport {
private AgentClient client;
@@ -85,9 +87,9 @@ public class ConsulHealthTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(2, ref.size());
- Assert.assertEquals(2, res.size());
- Assert.assertEquals(ref, res);
+ Assertions.assertEquals(2, ref.size());
+ Assertions.assertEquals(2, res.size());
+ Assertions.assertEquals(ref, res);
assertTrue(registrations.stream().anyMatch(
r -> r.getPort().isPresent() && r.getPort().get() == res.get(0).getService().getPort() && r.getId().equalsIgnoreCase(res.get(0).getService().getId())
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java
index dc03889..6c96fc4 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java
@@ -21,7 +21,10 @@ import java.util.Optional;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulKeyValueTest extends ConsulTestSupport {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java
index 716e25e..7dcfab9 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java
@@ -22,7 +22,7 @@ import java.util.Random;
import com.orbitz.consul.KeyValueClient;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsulKeyValueWatchTest extends ConsulTestSupport {
private String key;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
index 67cc2fd..a6fa6a7 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
@@ -23,14 +23,15 @@ import java.util.Set;
import com.orbitz.consul.Consul;
import org.apache.camel.NoSuchBeanException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Unit test for Camel Registry implementation for Consul
@@ -49,7 +50,7 @@ public class ConsulRegistryTest implements Serializable {
}
}
- @BeforeClass
+ @BeforeAll
public static void setUp() {
container = ConsulTestSupport.consulContainer();
container.start();
@@ -57,7 +58,7 @@ public class ConsulRegistryTest implements Serializable {
registry = new ConsulRegistry(container.getContainerIpAddress(), container.getMappedPort(Consul.DEFAULT_HTTP_PORT));
}
- @AfterClass
+ @AfterAll
public static void tearDown() {
container.stop();
}
@@ -165,8 +166,8 @@ public class ConsulRegistryTest implements Serializable {
}
- @Test(expected = NoSuchBeanException.class)
+ @Test
public void deleteNonExisting() {
- registry.remove("nonExisting");
+ assertThrows(NoSuchBeanException.class, () -> registry.remove("nonExisting"));
}
}
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java
index f56045d..221e569 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java
@@ -21,10 +21,10 @@ import java.util.Arrays;
import java.util.List;
import org.apache.camel.component.consul.ConsulRegistry.ConsulRegistryUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="https://github.com/ppalaga">Peter Palaga</a>
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java
index 63fa765..300feaa 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java
@@ -24,8 +24,8 @@ import com.orbitz.consul.model.session.SessionCreatedResponse;
import com.orbitz.consul.model.session.SessionInfo;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulSessionActions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class ConsulSessionTest extends ConsulTestSupport {
@@ -40,8 +40,8 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(sessions, list.size());
- Assert.assertFalse(list.stream().anyMatch(s -> s.getName().isPresent() && s.getName().get().equals(name)));
+ Assertions.assertEquals(sessions, list.size());
+ Assertions.assertFalse(list.stream().anyMatch(s -> s.getName().isPresent() && s.getName().get().equals(name)));
}
SessionCreatedResponse res = fluentTemplate()
@@ -50,7 +50,7 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(SessionCreatedResponse.class);
- Assert.assertNotNull(res.getId());
+ Assertions.assertNotNull(res.getId());
{
List<SessionInfo> list = fluentTemplate()
@@ -58,8 +58,8 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(sessions + 1, list.size());
- Assert.assertTrue(list.stream().anyMatch(s -> s.getName().isPresent() && s.getName().get().equals(name)));
+ Assertions.assertEquals(sessions + 1, list.size());
+ Assertions.assertTrue(list.stream().anyMatch(s -> s.getName().isPresent() && s.getName().get().equals(name)));
}
{
@@ -74,8 +74,8 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(sessions, list.size());
- Assert.assertFalse(list.stream().anyMatch(s -> s.getName().isPresent() && s.getName().get().equals(name)));
+ Assertions.assertEquals(sessions, list.size());
+ Assertions.assertFalse(list.stream().anyMatch(s -> s.getName().isPresent() && s.getName().get().equals(name)));
}
}
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index 5dff0b3..2fecc6d 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -24,10 +24,8 @@ import com.orbitz.consul.Consul;
import com.orbitz.consul.KeyValueClient;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.Wait;
-import org.junit.Rule;
-import org.junit.rules.TestName;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class ConsulTestSupport extends ContainerAwareTestSupport {
@@ -35,9 +33,6 @@ public class ConsulTestSupport extends ContainerAwareTestSupport {
public static final String CONTAINER_NAME = "consul";
public static final String KV_PREFIX = "/camel";
- @Rule
- public final TestName testName = new TestName();
-
@BindToRegistry("consul")
public ConsulComponent getConsulComponent() {
ConsulComponent component = new ConsulComponent();
@@ -69,7 +64,7 @@ public class ConsulTestSupport extends ContainerAwareTestSupport {
}
protected String generateKey() {
- return KV_PREFIX + "/" + testName.getMethodName() + "/" + generateRandomString();
+ return KV_PREFIX + "/" + getCurrentTestName() + "/" + generateRandomString();
}
protected String consulUrl() {
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
index c21ed04..1f054d0 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsulDefaultServiceCallRouteTest extends ConsulTestSupport {
private static final String SERVICE_NAME = "http-service";
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
index eb7c769..ec26483 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsulRibbonServiceCallRouteTest extends ConsulTestSupport {
private static final String SERVICE_NAME = "http-service";
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
index e7f6a80..506fcfd 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
@@ -23,9 +23,12 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.impl.cloud.ServiceRegistrationRoutePolicy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.util.SocketUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class ConsulServiceCallWithRegistrationTest extends ConsulTestSupport {
private static final String SERVICE_HOST = "localhost";
@@ -93,7 +96,7 @@ public class ConsulServiceCallWithRegistrationTest extends ConsulTestSupport {
assertEquals("ping on " + port, template.requestBody("direct:start", "ping", String.class));
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testServiceCallFailure() throws Exception {
final int port = SocketUtils.findAvailableTcpPort();
final String serviceId = UUID.randomUUID().toString();
@@ -126,7 +129,6 @@ public class ConsulServiceCallWithRegistrationTest extends ConsulTestSupport {
context.start();
- template.requestBody("direct:start", "ping", String.class);
- fail("Should have failed");
+ assertThrows(CamelExecutionException.class, () -> template.requestBody("direct:start", "ping", String.class));
}
}
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
index 8023c29..d0277e8 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
@@ -29,9 +29,12 @@ import org.apache.camel.cloud.ServiceDiscovery;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.util.SocketUtils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ConsulServiceDiscoveryTest extends ConsulTestSupport {
private AgentClient client;
private List<Registration> registrations;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
index b9a3bed..231cf88 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
@@ -28,9 +28,12 @@ import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.CamelContext;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.consul.ConsulTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.util.SocketUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public abstract class ConsulServiceRegistrationTestBase extends ConsulTestSupport {
protected static final String SERVICE_ID = UUID.randomUUID().toString();
protected static final String SERVICE_NAME = "my-service";
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java
index 2c7f574..b4e0df0 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java
@@ -24,7 +24,9 @@ import com.orbitz.consul.model.catalog.CatalogService;
import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.impl.cloud.DefaultServiceDefinition;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ConsulServiceRegistryTest extends ConsulTestSupport {
@Override
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 31b45c5..3b74fbb 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -295,6 +295,13 @@ public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCa
}
/**
+ * Gets the name of the current test being executed.
+ */
+ public final String getCurrentTestName() {
+ return currentTestName;
+ }
+
+ /**
* Override to enable debugger
* <p/>
* Is default <tt>false</tt>