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 2020/05/10 15:32:44 UTC
[camel] branch master updated: CAMEL-11807: Migrated
camel-debezium-*/disruptor tests to JUnit 5
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 29f8788 CAMEL-11807: Migrated camel-debezium-*/disruptor tests to JUnit 5
29f8788 is described below
commit 29f8788c822ba87ae71d8e08a58ce93b291b1bc7
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri May 8 17:33:43 2020 +0200
CAMEL-11807: Migrated camel-debezium-*/disruptor tests to JUnit 5
---
components/camel-debezium-mysql/pom.xml | 2 +-
.../debezium/DebeziumMySqlComponentTest.java | 109 ++++++++++---------
...ConnectorEmbeddedDebeziumConfigurationTest.java | 12 ++-
components/camel-debezium-postgres/pom.xml | 2 +-
.../debezium/DebeziumPostgresComponentTest.java | 107 +++++++++---------
...ConnectorEmbeddedDebeziumConfigurationTest.java | 12 ++-
components/camel-debezium-sqlserver/pom.xml | 2 +-
.../debezium/DebeziumSqlserverComponentTest.java | 107 +++++++++---------
...ConnectorEmbeddedDebeziumConfigurationTest.java | 14 +--
components/camel-disruptor/pom.xml | 7 +-
.../src/main/docs/disruptor-component.adoc | 2 +-
.../disruptor/BasicDisruptorComponentTest.java | 10 +-
.../DirectRequestReplyAndDisruptorInOnlyTest.java | 19 ++--
.../disruptor/DisruptorAsyncRouteTest.java | 12 ++-
.../disruptor/DisruptorBlockWhenFullTest.java | 27 +++--
.../disruptor/DisruptorBufferingTest.java | 20 ++--
.../disruptor/DisruptorComplexInOutTest.java | 12 ++-
.../DisruptorComponentReferenceEndpointTest.java | 15 +--
.../DisruptorConcurrentConsumersNPEIssueTest.java | 15 +--
.../DisruptorConcurrentConsumersTest.java | 10 +-
.../disruptor/DisruptorConcurrentTest.java | 52 ++++-----
.../disruptor/DisruptorConfigureTest.java | 89 +++++++--------
.../DisruptorConsumerSuspendResumeTest.java | 12 ++-
.../disruptor/DisruptorFromRouteIdTest.java | 12 ++-
.../disruptor/DisruptorInOnlyChainedTest.java | 10 +-
.../component/disruptor/DisruptorInOnlyTest.java | 10 +-
.../disruptor/DisruptorInOutBigChainedTest.java | 12 ++-
.../disruptor/DisruptorInOutChainedTest.java | 12 ++-
.../DisruptorInOutChainedTimeoutTest.java | 17 +--
.../DisruptorInOutChainedWithOnCompletionTest.java | 14 +--
.../component/disruptor/DisruptorInOutTest.java | 12 ++-
...sruptorInOutWithErrorDeadLetterChannelTest.java | 10 +-
.../disruptor/DisruptorInOutWithErrorTest.java | 14 ++-
.../disruptor/DisruptorMultipleConsumersTest.java | 14 +--
.../disruptor/DisruptorNoConsumerTest.java | 15 +--
...sruptorReconfigureWithBlockingProducerTest.java | 20 ++--
.../DisruptorRemoveRouteThenAddAgainTest.java | 10 +-
.../disruptor/DisruptorRingBufferTest.java | 10 +-
.../component/disruptor/DisruptorRouteTest.java | 11 +-
.../DisruptorShouldNotUseSameThreadTest.java | 19 ++--
.../disruptor/DisruptorTimeoutDisabledTest.java | 12 ++-
.../component/disruptor/DisruptorTimeoutTest.java | 21 ++--
.../disruptor/DisruptorUnitOfWorkTest.java | 18 ++--
.../DisruptorWaitClaimStrategyComponentTest.java | 68 ++++++------
.../DisruptorWaitForTaskAsPropertyTest.java | 16 +--
...sruptorWaitForTaskCompleteOnCompletionTest.java | 20 ++--
.../DisruptorWaitForTaskCompleteTest.java | 14 +--
.../DisruptorWaitForTaskIfReplyExpectedTest.java | 14 +--
.../DisruptorWaitForTaskNeverOnCompletionTest.java | 19 ++--
.../disruptor/DisruptorWaitForTaskNeverTest.java | 14 +--
.../DisruptorWaitStrategyCreationTest.java | 8 +-
.../FileDisruptorShutdownCompleteAllTasksTest.java | 17 +--
.../disruptor/MulticastDisruptorComponentTest.java | 14 +--
.../disruptor/SedaDisruptorCompareTest.java | 119 +++++++++++----------
.../disruptor/vm/AbstractVmTestSupport.java | 12 +--
.../DisruptorVmComponentReferenceEndpointTest.java | 15 +--
.../vm/DisruptorVmConcurrentConsumersTest.java | 8 +-
...mDifferentOptionsOnConsumerAndProducerTest.java | 16 +--
.../disruptor/vm/DisruptorVmInOnlyChainedTest.java | 16 +--
.../disruptor/vm/DisruptorVmInOnlyTest.java | 12 +--
.../disruptor/vm/DisruptorVmInOutChainedTest.java | 17 +--
.../vm/DisruptorVmInOutChainedTimeoutTest.java | 19 ++--
.../disruptor/vm/DisruptorVmInOutTest.java | 14 +--
.../vm/DisruptorVmInOutWithErrorTest.java | 16 +--
.../vm/DisruptorVmMultipleConsumersIssueTest.java | 10 +-
.../DisruptorVmMultipleContextsStartStopTest.java | 12 +--
.../disruptor/vm/DisruptorVmQueueTest.java | 12 +--
.../vm/DisruptorVmShouldNotUseSameThreadTest.java | 21 ++--
.../disruptor/vm/DisruptorVmSplitterTest.java | 12 +--
.../disruptor/vm/DisruptorVmTimeoutIssueTest.java | 18 ++--
.../disruptor/vm/DisruptorVmUseSameQueueTest.java | 12 +--
.../vm/DisruptorVmWaitForTaskCompleteTest.java | 16 +--
.../DisruptorVmWaitForTaskIfReplyExpectedTest.java | 17 +--
.../vm/DisruptorVmWaitForTaskNewerTest.java | 17 +--
.../vm/SameDisruptorVmQueueSizeAndNoSizeTest.java | 18 ++--
75 files changed, 859 insertions(+), 716 deletions(-)
diff --git a/components/camel-debezium-mysql/pom.xml b/components/camel-debezium-mysql/pom.xml
index 011346c..5b15d2b 100644
--- a/components/camel-debezium-mysql/pom.xml
+++ b/components/camel-debezium-mysql/pom.xml
@@ -61,7 +61,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java b/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
index aa434f5..7f63573 100644
--- a/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
+++ b/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
@@ -22,15 +22,16 @@ import java.util.Map;
import org.apache.camel.component.debezium.configuration.MySqlConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class DebeziumMySqlComponentTest {
@Test
- public void testIfMySqlEndpointCreatedWithConfig() throws Exception {
+ void testIfMySqlEndpointCreatedWithConfig() throws Exception {
final Map<String, Object> params = new HashMap<>();
params.put("offsetStorageFileName", "/offset_test_file");
params.put("databaseHostname", "localhost");
@@ -45,27 +46,27 @@ public class DebeziumMySqlComponentTest {
+ "databaseHostName=localhost&databaseServerId=1234&databaseUser=dbz&databasePassword=pwd&"
+ "databaseServerName=test&databaseHistoryFileName=/test";
- final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
- debeziumComponent.start();
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
-
- assertNotNull(debeziumEndpoint);
-
- // test for config
- final MySqlConnectorEmbeddedDebeziumConfiguration configuration = (MySqlConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertEquals("test_name", configuration.getName());
- assertEquals("/offset_test_file", configuration.getOffsetStorageFileName());
- assertEquals("localhost", configuration.getDatabaseHostname());
- assertEquals("dbz", configuration.getDatabaseUser());
- assertEquals("pwd", configuration.getDatabasePassword());
- assertEquals("test", configuration.getDatabaseServerName());
- assertEquals(1234L, configuration.getDatabaseServerId());
- assertEquals("/db_history_file_test", configuration.getDatabaseHistoryFileFilename());
+ try (final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
+ final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
+
+ assertNotNull(debeziumEndpoint);
+
+ // test for config
+ final MySqlConnectorEmbeddedDebeziumConfiguration configuration = (MySqlConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertEquals("test_name", configuration.getName());
+ assertEquals("/offset_test_file", configuration.getOffsetStorageFileName());
+ assertEquals("localhost", configuration.getDatabaseHostname());
+ assertEquals("dbz", configuration.getDatabaseUser());
+ assertEquals("pwd", configuration.getDatabasePassword());
+ assertEquals("test", configuration.getDatabaseServerName());
+ assertEquals(1234L, configuration.getDatabaseServerId());
+ assertEquals("/db_history_file_test", configuration.getDatabaseHistoryFileFilename());
+ }
}
@Test
- public void testIfCreatesComponentWithExternalConfiguration() throws Exception {
+ void testIfCreatesComponentWithExternalConfiguration() throws Exception {
final MySqlConnectorEmbeddedDebeziumConfiguration configuration = new MySqlConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_db");
@@ -74,52 +75,54 @@ public class DebeziumMySqlComponentTest {
configuration.setDatabaseServerName("test");
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(configuration);
+ // set configurations
+ debeziumComponent.setConfiguration(configuration);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, null,
- Collections.emptyMap());
+ final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, null, Collections.emptyMap());
- assertNotNull(debeziumEndpoint);
+ assertNotNull(debeziumEndpoint);
- // assert configurations
- final MySqlConnectorEmbeddedDebeziumConfiguration actualConfigurations = (MySqlConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertNotNull(actualConfigurations);
- assertEquals(configuration.getName(), actualConfigurations.getName());
- assertEquals(configuration.getDatabaseUser(),
- actualConfigurations.getDatabaseUser());
- assertEquals(configuration.getConnectorClass(), actualConfigurations.getConnectorClass());
+ // assert configurations
+ final MySqlConnectorEmbeddedDebeziumConfiguration actualConfigurations = (MySqlConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertNotNull(actualConfigurations);
+ assertEquals(configuration.getName(), actualConfigurations.getName());
+ assertEquals(configuration.getDatabaseUser(), actualConfigurations.getDatabaseUser());
+ assertEquals(configuration.getConnectorClass(), actualConfigurations.getConnectorClass());
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurations() throws Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurations() throws Exception {
final String remaining = "";
final String uri = "debezium:";
- final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining, Collections.emptyMap());
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurationsWithValidUri() throws Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurationsWithValidUri() throws Exception {
final String remaining = "dummy";
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining, Collections.emptyMap());
+ });
+ }
}
}
diff --git a/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java b/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java
index 9c387f0..fc3d12f 100644
--- a/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java
+++ b/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java
@@ -22,14 +22,16 @@ import io.debezium.connector.mysql.MySqlConnector;
import io.debezium.connector.mysql.MySqlConnectorConfig;
import io.debezium.embedded.EmbeddedEngine;
import org.apache.camel.component.debezium.DebeziumConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+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 MySqlConnectorEmbeddedDebeziumConfigurationTest {
@Test
- public void testIfCreatesConfig() {
+ void testIfCreatesConfig() {
final MySqlConnectorEmbeddedDebeziumConfiguration configuration = new MySqlConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_user");
@@ -53,7 +55,7 @@ public class MySqlConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testIfValidatesConfigurationCorrectly() {
+ void testIfValidatesConfigurationCorrectly() {
final MySqlConnectorEmbeddedDebeziumConfiguration configuration = new MySqlConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
@@ -72,7 +74,7 @@ public class MySqlConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testValidateConfigurationsForAllRequiredFields() {
+ void testValidateConfigurationsForAllRequiredFields() {
final MySqlConnectorEmbeddedDebeziumConfiguration configuration = new MySqlConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_db");
diff --git a/components/camel-debezium-postgres/pom.xml b/components/camel-debezium-postgres/pom.xml
index d44cf32..a977fab 100644
--- a/components/camel-debezium-postgres/pom.xml
+++ b/components/camel-debezium-postgres/pom.xml
@@ -48,7 +48,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java b/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java
index 296ead0..f7797a2 100644
--- a/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java
+++ b/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java
@@ -22,15 +22,16 @@ import java.util.Map;
import org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class DebeziumPostgresComponentTest {
@Test
- public void testIfConnectorEndpointCreatedWithConfig() throws Exception {
+ void testIfConnectorEndpointCreatedWithConfig() throws Exception {
final Map<String, Object> params = new HashMap<>();
params.put("offsetStorageFileName", "/offset_test_file");
params.put("databaseHostname", "localhost");
@@ -45,26 +46,26 @@ public class DebeziumPostgresComponentTest {
+ "databaseHostName=localhost&databaseServerId=1234&databaseUser=dbz&databasePassword=pwd&"
+ "databaseServerName=test&databaseHistoryFileName=/test";
- final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
- debeziumComponent.start();
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
-
- assertNotNull(debeziumEndpoint);
-
- // test for config
- final PostgresConnectorEmbeddedDebeziumConfiguration configuration = (PostgresConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertEquals("test_name", configuration.getName());
- assertEquals("/offset_test_file", configuration.getOffsetStorageFileName());
- assertEquals("localhost", configuration.getDatabaseHostname());
- assertEquals("dbz", configuration.getDatabaseUser());
- assertEquals("pwd", configuration.getDatabasePassword());
- assertEquals("test", configuration.getDatabaseServerName());
- assertEquals("/db_history_file_test", configuration.getDatabaseHistoryFileFilename());
+ try (final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
+ final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
+
+ assertNotNull(debeziumEndpoint);
+
+ // test for config
+ final PostgresConnectorEmbeddedDebeziumConfiguration configuration = (PostgresConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertEquals("test_name", configuration.getName());
+ assertEquals("/offset_test_file", configuration.getOffsetStorageFileName());
+ assertEquals("localhost", configuration.getDatabaseHostname());
+ assertEquals("dbz", configuration.getDatabaseUser());
+ assertEquals("pwd", configuration.getDatabasePassword());
+ assertEquals("test", configuration.getDatabaseServerName());
+ assertEquals("/db_history_file_test", configuration.getDatabaseHistoryFileFilename());
+ }
}
@Test
- public void testIfCreatesComponentWithExternalConfiguration() throws Exception {
+ void testIfCreatesComponentWithExternalConfiguration() throws Exception {
final PostgresConnectorEmbeddedDebeziumConfiguration configuration = new PostgresConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_db");
@@ -73,52 +74,54 @@ public class DebeziumPostgresComponentTest {
configuration.setDatabaseServerName("test");
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(configuration);
+ // set configurations
+ debeziumComponent.setConfiguration(configuration);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, null,
- Collections.emptyMap());
+ final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, null, Collections.emptyMap());
- assertNotNull(debeziumEndpoint);
+ assertNotNull(debeziumEndpoint);
- // assert configurations
- final PostgresConnectorEmbeddedDebeziumConfiguration actualConfigurations = (PostgresConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertNotNull(actualConfigurations);
- assertEquals(configuration.getName(), actualConfigurations.getName());
- assertEquals(configuration.getDatabaseUser(),
- actualConfigurations.getDatabaseUser());
- assertEquals(configuration.getConnectorClass(), actualConfigurations.getConnectorClass());
+ // assert configurations
+ final PostgresConnectorEmbeddedDebeziumConfiguration actualConfigurations = (PostgresConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertNotNull(actualConfigurations);
+ assertEquals(configuration.getName(), actualConfigurations.getName());
+ assertEquals(configuration.getDatabaseUser(), actualConfigurations.getDatabaseUser());
+ assertEquals(configuration.getConnectorClass(), actualConfigurations.getConnectorClass());
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurations() throws Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurations() throws Exception {
final String remaining = "";
final String uri = "debezium:";
- final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining, Collections.emptyMap());
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurationsWithValidUri() throws Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurationsWithValidUri() throws Exception {
final String remaining = "dummy";
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining, Collections.emptyMap());
+ });
+ }
}
}
diff --git a/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/configuration/PostgresConnectorEmbeddedDebeziumConfigurationTest.java b/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/configuration/PostgresConnectorEmbeddedDebeziumConfigurationTest.java
index b1a3051..70e6ab5 100644
--- a/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/configuration/PostgresConnectorEmbeddedDebeziumConfigurationTest.java
+++ b/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/configuration/PostgresConnectorEmbeddedDebeziumConfigurationTest.java
@@ -22,14 +22,16 @@ import io.debezium.connector.postgresql.PostgresConnector;
import io.debezium.connector.postgresql.PostgresConnectorConfig;
import io.debezium.embedded.EmbeddedEngine;
import org.apache.camel.component.debezium.DebeziumConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+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 PostgresConnectorEmbeddedDebeziumConfigurationTest {
@Test
- public void testIfCreatesConfig() {
+ void testIfCreatesConfig() {
final PostgresConnectorEmbeddedDebeziumConfiguration configuration = new PostgresConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_user");
@@ -46,7 +48,7 @@ public class PostgresConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testIfValidatesConfigurationCorrectly() {
+ void testIfValidatesConfigurationCorrectly() {
final PostgresConnectorEmbeddedDebeziumConfiguration configuration = new PostgresConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
@@ -64,7 +66,7 @@ public class PostgresConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testValidateConfigurationsForAllRequiredFields() {
+ void testValidateConfigurationsForAllRequiredFields() {
final PostgresConnectorEmbeddedDebeziumConfiguration configuration = new PostgresConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_db");
diff --git a/components/camel-debezium-sqlserver/pom.xml b/components/camel-debezium-sqlserver/pom.xml
index 2009fab..2a50a30 100644
--- a/components/camel-debezium-sqlserver/pom.xml
+++ b/components/camel-debezium-sqlserver/pom.xml
@@ -48,7 +48,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java b/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java
index 3dfbfb0..7ff714f 100644
--- a/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java
+++ b/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java
@@ -22,15 +22,16 @@ import java.util.Map;
import org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class DebeziumSqlserverComponentTest {
@Test
- public void testIfConnectorEndpointCreatedWithConfig() throws Exception {
+ void testIfConnectorEndpointCreatedWithConfig() throws Exception {
final Map<String, Object> params = new HashMap<>();
params.put("offsetStorageFileName", "/offset_test_file");
params.put("databaseHostname", "localhost");
@@ -45,26 +46,26 @@ public class DebeziumSqlserverComponentTest {
+ "databaseHostName=localhost&databaseServerId=1234&databaseUser=dbz&databasePassword=pwd&"
+ "databaseServerName=test&databaseHistoryFileName=/test";
- final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
- debeziumComponent.start();
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
-
- assertNotNull(debeziumEndpoint);
-
- // test for config
- final SqlServerConnectorEmbeddedDebeziumConfiguration configuration = (SqlServerConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertEquals("test_name", configuration.getName());
- assertEquals("/offset_test_file", configuration.getOffsetStorageFileName());
- assertEquals("localhost", configuration.getDatabaseHostname());
- assertEquals("dbz", configuration.getDatabaseUser());
- assertEquals("pwd", configuration.getDatabasePassword());
- assertEquals("test", configuration.getDatabaseServerName());
- assertEquals("/db_history_file_test", configuration.getDatabaseHistoryFileFilename());
+ try (final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
+ final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
+
+ assertNotNull(debeziumEndpoint);
+
+ // test for config
+ final SqlServerConnectorEmbeddedDebeziumConfiguration configuration = (SqlServerConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertEquals("test_name", configuration.getName());
+ assertEquals("/offset_test_file", configuration.getOffsetStorageFileName());
+ assertEquals("localhost", configuration.getDatabaseHostname());
+ assertEquals("dbz", configuration.getDatabaseUser());
+ assertEquals("pwd", configuration.getDatabasePassword());
+ assertEquals("test", configuration.getDatabaseServerName());
+ assertEquals("/db_history_file_test", configuration.getDatabaseHistoryFileFilename());
+ }
}
@Test
- public void testIfCreatesComponentWithExternalConfiguration() throws Exception {
+ void testIfCreatesComponentWithExternalConfiguration() throws Exception {
final SqlServerConnectorEmbeddedDebeziumConfiguration configuration = new SqlServerConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_db");
@@ -73,52 +74,54 @@ public class DebeziumSqlserverComponentTest {
configuration.setDatabaseServerName("test");
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(configuration);
+ // set configurations
+ debeziumComponent.setConfiguration(configuration);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, null,
- Collections.emptyMap());
+ final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, null, Collections.emptyMap());
- assertNotNull(debeziumEndpoint);
+ assertNotNull(debeziumEndpoint);
- // assert configurations
- final SqlServerConnectorEmbeddedDebeziumConfiguration actualConfigurations = (SqlServerConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint
- .getConfiguration();
- assertNotNull(actualConfigurations);
- assertEquals(configuration.getName(), actualConfigurations.getName());
- assertEquals(configuration.getDatabaseUser(),
- actualConfigurations.getDatabaseUser());
- assertEquals(configuration.getConnectorClass(), actualConfigurations.getConnectorClass());
+ // assert configurations
+ final SqlServerConnectorEmbeddedDebeziumConfiguration actualConfigurations = (SqlServerConnectorEmbeddedDebeziumConfiguration)debeziumEndpoint.getConfiguration();
+ assertNotNull(actualConfigurations);
+ assertEquals(configuration.getName(), actualConfigurations.getName());
+ assertEquals(configuration.getDatabaseUser(), actualConfigurations.getDatabaseUser());
+ assertEquals(configuration.getConnectorClass(), actualConfigurations.getConnectorClass());
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurations() throws Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurations() throws Exception {
final String remaining = "";
final String uri = "debezium:";
- final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining, Collections.emptyMap());
+ });
+ }
}
- @Test(expected = IllegalArgumentException.class)
- public void testIfItHandlesNullExternalConfigurationsWithValidUri() throws Exception {
+ @Test
+ void testIfItHandlesNullExternalConfigurationsWithValidUri() throws Exception {
final String remaining = "dummy";
final String uri = "debezium:dummy";
- final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
- debeziumComponent.start();
+ try (final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext())) {
+ debeziumComponent.start();
- // set configurations
- debeziumComponent.setConfiguration(null);
+ // set configurations
+ debeziumComponent.setConfiguration(null);
- final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining,
- Collections.emptyMap());
+ assertThrows(IllegalArgumentException.class, () -> {
+ debeziumComponent.createEndpoint(uri, remaining, Collections.emptyMap());
+ });
+ }
}
}
diff --git a/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/configuration/SqlserverConnectorEmbeddedDebeziumConfigurationTest.java b/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/configuration/SqlserverConnectorEmbeddedDebeziumConfigurationTest.java
index ca34efd..9a5151b 100644
--- a/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/configuration/SqlserverConnectorEmbeddedDebeziumConfigurationTest.java
+++ b/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/configuration/SqlserverConnectorEmbeddedDebeziumConfigurationTest.java
@@ -21,16 +21,16 @@ import io.debezium.config.Configuration;
import io.debezium.connector.sqlserver.SqlServerConnector;
import io.debezium.embedded.EmbeddedEngine;
import org.apache.camel.component.debezium.DebeziumConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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 SqlserverConnectorEmbeddedDebeziumConfigurationTest {
@Test
- public void testIfCreatesConfig() {
+ void testIfCreatesConfig() {
final SqlServerConnectorEmbeddedDebeziumConfiguration configuration = new SqlServerConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_user");
@@ -47,7 +47,7 @@ public class SqlserverConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testIfValidatesConfigurationCorrectly() {
+ void testIfValidatesConfigurationCorrectly() {
final SqlServerConnectorEmbeddedDebeziumConfiguration configuration = new SqlServerConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
@@ -65,7 +65,7 @@ public class SqlserverConnectorEmbeddedDebeziumConfigurationTest {
}
@Test
- public void testValidateConfigurationsForAllRequiredFields() {
+ void testValidateConfigurationsForAllRequiredFields() {
final SqlServerConnectorEmbeddedDebeziumConfiguration configuration = new SqlServerConnectorEmbeddedDebeziumConfiguration();
configuration.setName("test_config");
configuration.setDatabaseUser("test_db");
diff --git a/components/camel-disruptor/pom.xml b/components/camel-disruptor/pom.xml
index 3c257ef..7654cbd 100644
--- a/components/camel-disruptor/pom.xml
+++ b/components/camel-disruptor/pom.xml
@@ -47,7 +47,12 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-disruptor/src/main/docs/disruptor-component.adoc b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
index 8af55c0..39e0b71 100644
--- a/components/camel-disruptor/src/main/docs/disruptor-component.adoc
+++ b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
@@ -258,7 +258,7 @@ to the original caller.
[source,java]
-------------------------------------------------
-public void configure() throws Exception {
+public void configure() {
from("direct:start")
// send it to the disruptor that is async
.to("disruptor:next")
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
index 1e00828..002f8e7 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Tests some of the basic disruptor functionality
@@ -37,7 +37,7 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
private ProducerTemplate template;
@Test
- public void testProduce() throws InterruptedException {
+ void testProduce() throws InterruptedException {
resultEndpoint.expectedBodiesReceived(VALUE);
resultEndpoint.setExpectedMessageCount(1);
@@ -47,10 +47,10 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:test")
.to("mock:result");
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java
index 6c43abb..5899d90 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java
@@ -17,26 +17,33 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DirectRequestReplyAndDisruptorInOnlyTest extends CamelTestSupport {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DirectRequestReplyAndDisruptorInOnlyTest.class);
+
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:log").expectedBodiesReceived("Logging: Bye World");
final String out = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- log.info("Got reply " + out);
+ LOG.info("Got reply " + out);
assertMockEndpointsSatisfied();
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
// send the message as InOnly to DISRUPTOR as we want to continue routing
// (as we don't want to do request/reply over DISRUPTOR)
// In EIP patterns the WireTap pattern is what this would be
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java
index 5ffb7a3..029767b 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java
@@ -18,15 +18,17 @@ package org.apache.camel.component.disruptor;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Unit test based on user forum request.
*/
public class DisruptorAsyncRouteTest extends CamelTestSupport {
@Test
- public void testSendAsync() throws Exception {
+ void testSendAsync() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -39,11 +41,11 @@ public class DisruptorAsyncRouteTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
// START SNIPPET: e1
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start")
// send it to the disruptor ring buffer that is async
.to("disruptor:next")
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java
index 1eede2c..67dd1ff 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests that a Disruptor producer blocks when a message is sent while the ring buffer is full.
@@ -39,14 +42,14 @@ public class DisruptorBlockWhenFullTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from(DEFAULT_URI).delay(DELAY).to(MOCK_URI);
}
};
}
@Test
- public void testDisruptorBlockingWhenFull() throws Exception {
+ void testDisruptorBlockingWhenFull() throws Exception {
getMockEndpoint(MOCK_URI).setExpectedMessageCount(QUEUE_SIZE + 20);
final DisruptorEndpoint disruptor = context.getEndpoint(DEFAULT_URI, DisruptorEndpoint.class);
@@ -56,15 +59,17 @@ public class DisruptorBlockWhenFullTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @Test(expected = CamelExecutionException.class)
- public void testDisruptorExceptionWhenFull() throws Exception {
- getMockEndpoint(MOCK_URI).setExpectedMessageCount(QUEUE_SIZE + 20);
+ @Test
+ void testDisruptorExceptionWhenFull() throws Exception {
+ assertThrows(CamelExecutionException.class, () -> {
+ getMockEndpoint(MOCK_URI).setExpectedMessageCount(QUEUE_SIZE + 20);
- final DisruptorEndpoint disruptor = context.getEndpoint(DEFAULT_URI, DisruptorEndpoint.class);
- assertEquals(QUEUE_SIZE, disruptor.getRemainingCapacity());
+ final DisruptorEndpoint disruptor = context.getEndpoint(DEFAULT_URI, DisruptorEndpoint.class);
+ assertEquals(QUEUE_SIZE, disruptor.getRemainingCapacity());
- sendSoManyOverCapacity(EXCEPTION_WHEN_FULL_URI, QUEUE_SIZE, 20);
- assertMockEndpointsSatisfied();
+ sendSoManyOverCapacity(EXCEPTION_WHEN_FULL_URI, QUEUE_SIZE, 20);
+ assertMockEndpointsSatisfied();
+ });
}
/**
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
index 3bfb098..ae7d449 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.disruptor;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* This test suite is testing different scenarios where a disruptor is forced to
@@ -28,7 +30,7 @@ import org.junit.Test;
public class DisruptorBufferingTest extends CamelTestSupport {
@Test
- public void testDisruptorBufferingWhileWaitingOnFirstConsumer() throws Exception {
+ void testDisruptorBufferingWhileWaitingOnFirstConsumer() throws Exception {
template.sendBody("disruptor:foo", "A");
template.sendBody("disruptor:foo", "B");
template.sendBody("disruptor:foo", "C");
@@ -41,7 +43,7 @@ public class DisruptorBufferingTest extends CamelTestSupport {
// Add a first consumer on the endpoint
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").routeId("bar").to("mock:bar");
}
});
@@ -54,7 +56,7 @@ public class DisruptorBufferingTest extends CamelTestSupport {
}
@Test
- public void testDisruptorBufferingWhileWaitingOnNextConsumer() throws Exception {
+ void testDisruptorBufferingWhileWaitingOnNextConsumer() throws Exception {
template.sendBody("disruptor:foo", "A");
template.sendBody("disruptor:foo", "B");
template.sendBody("disruptor:foo", "C");
@@ -67,7 +69,7 @@ public class DisruptorBufferingTest extends CamelTestSupport {
// Add a first consumer on the endpoint
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").routeId("bar1").delay(200).to("mock:bar");
}
});
@@ -92,7 +94,7 @@ public class DisruptorBufferingTest extends CamelTestSupport {
// Add a new consumer on the endpoint
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").routeId("bar2").to("mock:bar");
}
});
@@ -106,10 +108,10 @@ public class DisruptorBufferingTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").routeId("foo").to("disruptor:foo?size=8");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java
index b118760..1159e72 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java
@@ -17,12 +17,14 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorComplexInOutTest extends CamelTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final String out = template.requestBody("direct:start", "Hello World", String.class);
@@ -32,10 +34,10 @@ public class DisruptorComplexInOutTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
getContext().setTracing(true);
from("direct:start").to("disruptor:a");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java
index f3d4b1f..077ee12 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java
@@ -19,15 +19,18 @@ package org.apache.camel.component.disruptor;
import java.util.Iterator;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
public class DisruptorComponentReferenceEndpointTest extends CamelTestSupport {
@Test
- public void testDisruptorComponentReference() throws Exception {
+ void testDisruptorComponentReference() throws Exception {
final DisruptorComponent disruptor = context.getComponent("disruptor", DisruptorComponent.class);
final String fooKey = DisruptorComponent.getDisruptorKey("disruptor://foo");
@@ -37,7 +40,7 @@ public class DisruptorComponentReferenceEndpointTest extends CamelTestSupport {
// add a second consumer on the endpoint
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?concurrentConsumers=1").routeId("foo2").to("mock:foo2");
}
});
@@ -66,10 +69,10 @@ public class DisruptorComponentReferenceEndpointTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").routeId("foo").to("mock:foo");
from("disruptor:bar").routeId("bar").to("mock:bar");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java
index d9970bb..abaf485 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java
@@ -19,12 +19,15 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.FailedToStartRouteException;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class DisruptorConcurrentConsumersNPEIssueTest extends CamelTestSupport {
@Test
- public void testSendToDisruptor() throws Exception {
+ void testSendToDisruptor() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -43,7 +46,7 @@ public class DisruptorConcurrentConsumersNPEIssueTest extends CamelTestSupport {
}
@Test
- public void testStartThird() throws Exception {
+ void testStartThird() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -65,10 +68,10 @@ public class DisruptorConcurrentConsumersNPEIssueTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?concurrentConsumers=5").routeId("first").noAutoStartup()
.to("mock:result");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java
index d67c9a0..6f75000 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.disruptor;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorConcurrentConsumersTest extends CamelTestSupport {
@Test
- public void testSendToDisruptor() throws Exception {
+ void testSendToDisruptor() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -33,10 +33,10 @@ public class DisruptorConcurrentConsumersTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?concurrentConsumers=5").to("mock:result");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
index bb47b51..29f8d1f 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
@@ -27,12 +27,15 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.engine.DefaultProducerTemplate;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DisruptorConcurrentTest extends CamelTestSupport {
@Test
- public void testDisruptorConcurrentInOnly() throws Exception {
+ void testDisruptorConcurrentInOnly() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(20);
@@ -47,7 +50,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
}
@Test
- public void testDisruptorConcurrentInOnlyWithAsync() throws Exception {
+ void testDisruptorConcurrentInOnlyWithAsync() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(20);
@@ -62,7 +65,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
}
@Test
- public void testDisruptorConcurrentInOut() throws Exception {
+ void testDisruptorConcurrentInOut() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(20);
mock.allMessages().body().startsWith("Bye");
@@ -90,7 +93,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
}
@Test
- public void testDisruptorConcurrentInOutWithAsync() throws Exception {
+ void testDisruptorConcurrentInOutWithAsync() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(20);
mock.allMessages().body().startsWith("Bye");
@@ -100,32 +103,33 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
// use our own template that has a higher thread pool than default camel that uses 5
final ExecutorService executor = Executors.newFixedThreadPool(10);
- final ProducerTemplate pt = new DefaultProducerTemplate(context, executor);
- // must start the template
- pt.start();
-
- final List<Future<Object>> replies = new ArrayList<>(20);
- for (int i = 0; i < 20; i++) {
- final Future<Object> out = pt.asyncRequestBody("disruptor:bar", "Message " + i);
- replies.add(out);
- }
+ try (final ProducerTemplate pt = new DefaultProducerTemplate(context, executor)) {
+ // must start the template
+ pt.start();
+
+ final List<Future<Object>> replies = new ArrayList<>(20);
+ for (int i = 0; i < 20; i++) {
+ final Future<Object> out = pt.asyncRequestBody("disruptor:bar", "Message " + i);
+ replies.add(out);
+ }
- assertMockEndpointsSatisfied();
+ assertMockEndpointsSatisfied();
- assertEquals(20, replies.size());
- for (int i = 0; i < 20; i++) {
- final String out = (String)replies.get(i).get();
- assertTrue(out.startsWith("Bye"));
+ assertEquals(20, replies.size());
+ for (int i = 0; i < 20; i++) {
+ final String out = (String)replies.get(i).get();
+ assertTrue(out.startsWith("Bye"));
+ }
+ pt.stop();
+ executor.shutdownNow();
}
- pt.stop();
- executor.shutdownNow();
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?concurrentConsumers=10").to("mock:before").delay(2000).syncDelayed().to("mock:result");
from("disruptor:bar?concurrentConsumers=10").to("mock:before").delay(2000).syncDelayed()
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java
index 6146c71..e7b497b 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java
@@ -18,20 +18,23 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.WaitForTaskToComplete;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class DisruptorConfigureTest extends CamelTestSupport {
@Test
- public void testSizeConfigured() throws Exception {
+ void testSizeConfigured() throws Exception {
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo?size=2000",
DisruptorEndpoint.class);
- assertEquals("size", 2048, endpoint.getBufferSize());
- assertEquals("getRemainingCapacity", 2048, endpoint.getRemainingCapacity());
+ assertEquals(2048, endpoint.getBufferSize(), "size");
+ assertEquals(2048, endpoint.getRemainingCapacity(), "getRemainingCapacity");
}
@Test
- public void testIllegalSizeZeroConfigured() throws Exception {
+ void testIllegalSizeZeroConfigured() throws Exception {
try {
resolveMandatoryEndpoint("disruptor:foo?size=0", DisruptorEndpoint.class);
fail("Should have thrown exception");
@@ -43,103 +46,103 @@ public class DisruptorConfigureTest extends CamelTestSupport {
}
@Test
- public void testSizeThroughBufferSizeComponentProperty() throws Exception {
+ void testSizeThroughBufferSizeComponentProperty() throws Exception {
final DisruptorComponent disruptor = context.getComponent("disruptor", DisruptorComponent.class);
disruptor.setBufferSize(2000);
assertEquals(2000, disruptor.getBufferSize());
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo", DisruptorEndpoint.class);
- assertEquals("size", 2048, endpoint.getBufferSize());
- assertEquals("getRemainingCapacity", 2048, endpoint.getRemainingCapacity());
+ assertEquals(2048, endpoint.getBufferSize(), "size");
+ assertEquals(2048, endpoint.getRemainingCapacity(), "getRemainingCapacity");
}
@Test
- public void testMultipleConsumersConfigured() {
+ void testMultipleConsumersConfigured() {
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo?multipleConsumers=true",
DisruptorEndpoint.class);
- assertEquals("multipleConsumers", true, endpoint.isMultipleConsumers());
+ assertEquals(true, endpoint.isMultipleConsumers(), "multipleConsumers");
}
@Test
- public void testDefaultMultipleConsumersComponentProperty() throws Exception {
+ void testDefaultMultipleConsumersComponentProperty() throws Exception {
final DisruptorComponent disruptor = context.getComponent("disruptor", DisruptorComponent.class);
disruptor.setDefaultMultipleConsumers(true);
assertEquals(true, disruptor.isDefaultMultipleConsumers());
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo", DisruptorEndpoint.class);
- assertEquals("multipleConsumers", true, endpoint.isMultipleConsumers());
- assertEquals("multipleConsumers", true, endpoint.isMultipleConsumersSupported());
+ assertEquals(true, endpoint.isMultipleConsumers(), "multipleConsumers");
+ assertEquals(true, endpoint.isMultipleConsumersSupported(), "multipleConsumers");
}
@Test
- public void testProducerTypeConfigured() {
+ void testProducerTypeConfigured() {
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo?producerType=Single",
DisruptorEndpoint.class);
- assertEquals("producerType", DisruptorProducerType.Single, endpoint.getDisruptor().getProducerType());
+ assertEquals(DisruptorProducerType.Single, endpoint.getDisruptor().getProducerType(), "producerType");
}
@Test
- public void testDefaultProducerTypeComponentProperty() throws Exception {
+ void testDefaultProducerTypeComponentProperty() throws Exception {
final DisruptorComponent disruptor = context.getComponent("disruptor", DisruptorComponent.class);
disruptor.setDefaultProducerType(DisruptorProducerType.Single);
assertEquals(DisruptorProducerType.Single, disruptor.getDefaultProducerType());
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo", DisruptorEndpoint.class);
- assertEquals("producerType", DisruptorProducerType.Single, endpoint.getDisruptor().getProducerType());
+ assertEquals(DisruptorProducerType.Single, endpoint.getDisruptor().getProducerType(), "producerType");
}
@Test
- public void testWaitStrategyConfigured() {
+ void testWaitStrategyConfigured() {
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo?waitStrategy=BusySpin",
DisruptorEndpoint.class);
- assertEquals("waitStrategy", DisruptorWaitStrategy.BusySpin,
- endpoint.getDisruptor().getWaitStrategy());
+ assertEquals(DisruptorWaitStrategy.BusySpin,
+ endpoint.getDisruptor().getWaitStrategy(), "waitStrategy");
}
@Test
- public void testDefaultWaitStrategyComponentProperty() throws Exception {
+ void testDefaultWaitStrategyComponentProperty() throws Exception {
final DisruptorComponent disruptor = context.getComponent("disruptor", DisruptorComponent.class);
disruptor.setDefaultWaitStrategy(DisruptorWaitStrategy.BusySpin);
assertEquals(DisruptorWaitStrategy.BusySpin, disruptor.getDefaultWaitStrategy());
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo", DisruptorEndpoint.class);
- assertEquals("waitStrategy", DisruptorWaitStrategy.BusySpin,
- endpoint.getDisruptor().getWaitStrategy());
+ assertEquals(DisruptorWaitStrategy.BusySpin,
+ endpoint.getDisruptor().getWaitStrategy(), "waitStrategy");
}
@Test
- public void testConcurrentConsumersConfigured() {
+ void testConcurrentConsumersConfigured() {
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo?concurrentConsumers=5",
DisruptorEndpoint.class);
- assertEquals("concurrentConsumers", 5, endpoint.getConcurrentConsumers());
+ assertEquals(5, endpoint.getConcurrentConsumers(), "concurrentConsumers");
}
@Test
- public void testDefaultConcurrentConsumersComponentProperty() throws Exception {
+ void testDefaultConcurrentConsumersComponentProperty() throws Exception {
final DisruptorComponent disruptor = context.getComponent("disruptor", DisruptorComponent.class);
disruptor.setDefaultConcurrentConsumers(5);
assertEquals(5, disruptor.getDefaultConcurrentConsumers());
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo", DisruptorEndpoint.class);
- assertEquals("concurrentConsumers", 5, endpoint.getConcurrentConsumers());
+ assertEquals(5, endpoint.getConcurrentConsumers(), "concurrentConsumers");
}
@Test
- public void testWaitForTaskToCompleteConfigured() {
+ void testWaitForTaskToCompleteConfigured() {
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint(
"disruptor:foo?waitForTaskToComplete=Never", DisruptorEndpoint.class);
- assertEquals("waitForTaskToComplete", WaitForTaskToComplete.Never,
- endpoint.getWaitForTaskToComplete());
+ assertEquals(WaitForTaskToComplete.Never,
+ endpoint.getWaitForTaskToComplete(), "waitForTaskToComplete");
}
@Test
- public void testDefaults() {
+ void testDefaults() {
final DisruptorEndpoint endpoint = resolveMandatoryEndpoint("disruptor:foo", DisruptorEndpoint.class);
- assertEquals("concurrentConsumers: wrong default", 1, endpoint.getConcurrentConsumers());
- assertEquals("bufferSize: wrong default", DisruptorComponent.DEFAULT_BUFFER_SIZE,
- endpoint.getBufferSize());
- assertEquals("timeout: wrong default", 30000L, endpoint.getTimeout());
- assertEquals("waitForTaskToComplete: wrong default", WaitForTaskToComplete.IfReplyExpected,
- endpoint.getWaitForTaskToComplete());
- assertEquals("DisruptorWaitStrategy: wrong default", DisruptorWaitStrategy.Blocking,
- endpoint.getDisruptor().getWaitStrategy());
- assertEquals("multipleConsumers: wrong default", false, endpoint.isMultipleConsumers());
- assertEquals("multipleConsumersSupported", false, endpoint.isMultipleConsumersSupported());
- assertEquals("producerType", DisruptorProducerType.Multi, endpoint.getDisruptor().getProducerType());
+ assertEquals(1, endpoint.getConcurrentConsumers(), "concurrentConsumers: wrong default");
+ assertEquals(DisruptorComponent.DEFAULT_BUFFER_SIZE,
+ endpoint.getBufferSize(), "bufferSize: wrong default");
+ assertEquals(30000L, endpoint.getTimeout(), "timeout: wrong default");
+ assertEquals(WaitForTaskToComplete.IfReplyExpected,
+ endpoint.getWaitForTaskToComplete(), "waitForTaskToComplete: wrong default");
+ assertEquals(DisruptorWaitStrategy.Blocking,
+ endpoint.getDisruptor().getWaitStrategy(), "DisruptorWaitStrategy: wrong default");
+ assertEquals(false, endpoint.isMultipleConsumers(), "multipleConsumers: wrong default");
+ assertEquals(false, endpoint.isMultipleConsumersSupported(), "multipleConsumersSupported");
+ assertEquals(DisruptorProducerType.Multi, endpoint.getDisruptor().getProducerType(), "producerType");
}
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
index be42588..f918f9f 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
@@ -19,15 +19,17 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.service.ServiceHelper;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
*/
public class DisruptorConsumerSuspendResumeTest extends CamelTestSupport {
@Test
- public void testSuspendResume() throws Exception {
+ void testSuspendResume() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:bar");
mock.expectedMessageCount(1);
@@ -70,10 +72,10 @@ public class DisruptorConsumerSuspendResumeTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").routeId("foo").to("disruptor:bar");
from("disruptor:bar").routeId("bar").to("mock:bar");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java
index 4b5c2b3..d8c1d42 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java
@@ -18,15 +18,17 @@ package org.apache.camel.component.disruptor;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
*/
public class DisruptorFromRouteIdTest extends CamelTestSupport {
@Test
- public void testDisruptorFromRouteId() throws Exception {
+ void testDisruptorFromRouteId() throws Exception {
final MockEndpoint foo = getMockEndpoint("mock:foo");
foo.expectedMessageCount(1);
@@ -44,10 +46,10 @@ public class DisruptorFromRouteIdTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").routeId("foo").to("mock:foo").to("disruptor:bar");
from("disruptor:bar").routeId("bar").to("mock:bar");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java
index 0bc2867..1283f76 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorInOnlyChainedTest extends CamelTestSupport {
@Test
- public void testInOnlyDisruptorChained() throws Exception {
+ void testInOnlyDisruptorChained() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("start");
getMockEndpoint("mock:b").expectedBodiesReceived("start-a");
getMockEndpoint("mock:c").expectedBodiesReceived("start-a-b");
@@ -33,10 +33,10 @@ public class DisruptorInOnlyChainedTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:a").to("mock:a").setBody(simple("${body}-a")).to("disruptor:b");
from("disruptor:b").to("mock:b").setBody(simple("${body}-b")).to("disruptor:c");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java
index 5e86493..91b8647 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorInOnlyTest extends CamelTestSupport {
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
template.sendBody("direct:start", "Hello World");
@@ -31,10 +31,10 @@ public class DisruptorInOnlyTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo");
from("disruptor:foo").to("mock:result");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java
index ce9985c..5514879 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java
@@ -17,12 +17,14 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorInOutBigChainedTest extends CamelTestSupport {
@Test
- public void testInOutBigDisruptorChained() throws Exception {
+ void testInOutBigDisruptorChained() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("start");
getMockEndpoint("mock:b").expectedBodiesReceived("start-a");
getMockEndpoint("mock:c").expectedBodiesReceived("start-a-b");
@@ -39,10 +41,10 @@ public class DisruptorInOutBigChainedTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:a").to("mock:a").transform(simple("${body}-a")).to("disruptor:b");
from("disruptor:b").to("mock:b").transform(simple("${body}-b")).to("disruptor:c");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java
index 94d0228..7218636 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java
@@ -17,12 +17,14 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorInOutChainedTest extends CamelTestSupport {
@Test
- public void testInOutDisruptorChained() throws Exception {
+ void testInOutDisruptorChained() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("start");
getMockEndpoint("mock:b").expectedBodiesReceived("start-a");
getMockEndpoint("mock:c").expectedBodiesReceived("start-a-b");
@@ -34,10 +36,10 @@ public class DisruptorInOutChainedTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:a").to("mock:a").transform(simple("${body}-a")).to("disruptor:b");
from("disruptor:b").to("mock:b").transform(simple("${body}-b")).to("disruptor:c");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java
index f4fb857..fc4c7b6 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java
@@ -19,13 +19,18 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.StopWatch;
-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;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorInOutChainedTimeoutTest extends CamelTestSupport {
@Test
- public void testDisruptorInOutChainedTimeout() throws Exception {
+ void testDisruptorInOutChainedTimeout() throws Exception {
// time timeout after 2 sec should trigger a immediately reply
final StopWatch watch = new StopWatch();
try {
@@ -38,14 +43,14 @@ public class DisruptorInOutChainedTimeoutTest extends CamelTestSupport {
}
final long delta = watch.taken();
- assertTrue("Should be faster than 4000 millis, was: " + delta, delta < 4000);
+ assertTrue(delta < 4000, "Should be faster than 4000 millis, was: " + delta);
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
errorHandler(noErrorHandler());
from("disruptor:a").to("mock:a")
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java
index 4604985..0656785 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java
@@ -21,12 +21,14 @@ import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.SynchronizationAdapter;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorInOutChainedWithOnCompletionTest extends CamelTestSupport {
@Test
- public void testInOutDisruptorChainedWithCustomOnCompletion() throws Exception {
+ void testInOutDisruptorChainedWithCustomOnCompletion() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("start");
getMockEndpoint("mock:b").expectedBodiesReceived("start-a");
// the onCustomCompletion should be send very last (as it will be handed over)
@@ -39,13 +41,13 @@ public class DisruptorInOutChainedWithOnCompletionTest extends CamelTestSupport
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:a").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
// should come in last
exchange.adapt(ExtendedExchange.class).addOnCompletion(new SynchronizationAdapter() {
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java
index 36ed5d3..04251ff 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java
@@ -17,12 +17,14 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorInOutTest extends CamelTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final String out = template.requestBody("direct:start", "Hello World", String.class);
@@ -32,10 +34,10 @@ public class DisruptorInOutTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo");
from("disruptor:foo").transform(constant("Bye World")).to("mock:result");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java
index 06cf35f..ad66ee1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorInOutWithErrorDeadLetterChannelTest extends CamelTestSupport {
@Test
- public void testInOutWithErrorUsingDLC() throws Exception {
+ void testInOutWithErrorUsingDLC() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:dead").expectedMessageCount(1);
@@ -32,10 +32,10 @@ public class DisruptorInOutWithErrorDeadLetterChannelTest extends CamelTestSuppo
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0));
from("direct:start").to("disruptor:foo");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java
index df6a5f9..bc71f48 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java
@@ -18,12 +18,16 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorInOutWithErrorTest extends CamelTestSupport {
@Test
- public void testInOutWithError() throws Exception {
+ void testInOutWithError() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(0);
try {
@@ -38,10 +42,10 @@ public class DisruptorInOutWithErrorTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo");
from("disruptor:foo").transform(constant("Bye World"))
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
index 8db78c5..93dc601 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorMultipleConsumersTest extends CamelTestSupport {
@Test
- public void testDisruptorMultipleConsumers() throws Exception {
+ void testDisruptorMultipleConsumers() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
getMockEndpoint("mock:b").expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
@@ -33,7 +33,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
}
@Test
- public void testDisruptorMultipleConsumersNewAdded() throws Exception {
+ void testDisruptorMultipleConsumersNewAdded() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
getMockEndpoint("mock:b").expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
getMockEndpoint("mock:c").expectedMessageCount(0);
@@ -45,7 +45,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?multipleConsumers=true").id("testRoute").to("mock:c");
}
@@ -77,10 +77,10 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?multipleConsumers=true").to("mock:a");
from("disruptor:foo?multipleConsumers=true").to("mock:b");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java
index b6d5653..ff537a5 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java
@@ -19,18 +19,21 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorNoConsumerTest extends CamelTestSupport {
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
// no problem for in only as we do not expect a reply
template.sendBody("direct:start", "Hello World");
}
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
try {
template.requestBody("direct:start", "Hello World");
fail("Should throw an exception");
@@ -40,10 +43,10 @@ public class DisruptorNoConsumerTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo?timeout=1000");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java
index eadb53a..bf60743 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java
@@ -20,15 +20,17 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("CAMEL-13629: Flaky test")
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Disabled("CAMEL-13629: Flaky test")
public class DisruptorReconfigureWithBlockingProducerTest extends CamelTestSupport {
@Test
- public void testDisruptorReconfigureWithBlockingProducer() throws Exception {
+ void testDisruptorReconfigureWithBlockingProducer() throws Exception {
getMockEndpoint("mock:a").expectedMessageCount(20);
getMockEndpoint("mock:b").expectedMinimumMessageCount(10);
@@ -41,7 +43,7 @@ public class DisruptorReconfigureWithBlockingProducerTest extends CamelTestSuppo
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?multipleConsumers=true&size=8").id("testRoute").to("mock:b");
}
});
@@ -51,7 +53,7 @@ public class DisruptorReconfigureWithBlockingProducerTest extends CamelTestSuppo
// If the reconfigure does not correctly hold back the producer thread on this request,
// it will take approximately 20*200=4000 ms.
// be on the safe side and check that it was at least faster than 2 seconds.
- assertTrue("Reconfigure of Disruptor blocked", (System.currentTimeMillis() - beforeStart) < 2000);
+ assertTrue((System.currentTimeMillis() - beforeStart) < 2000, "Reconfigure of Disruptor blocked");
//Wait and check that the producer has produced all messages without throwing an exception
assertTrue(producerThread.checkResult());
@@ -59,10 +61,10 @@ public class DisruptorReconfigureWithBlockingProducerTest extends CamelTestSuppo
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?multipleConsumers=true&size=8").delay(200).to("mock:a");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java
index fdb17f7..1fdf49c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.disruptor;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorRemoveRouteThenAddAgainTest extends CamelTestSupport {
@Test
- public void testRemoveRouteAndThenAddAgain() throws Exception {
+ void testRemoveRouteAndThenAddAgain() throws Exception {
MockEndpoint out = getMockEndpoint("mock:out");
out.expectedMessageCount(1);
out.expectedBodiesReceived("before removing the route");
@@ -55,10 +55,10 @@ public class DisruptorRemoveRouteThenAddAgainTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:in").routeId("disruptorToMock").to("mock:out");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java
index c285186..bfae6a6 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.disruptor;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorRingBufferTest extends CamelTestSupport {
@Test
- public void testQueue() throws Exception {
+ void testQueue() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World", "Goodday World", "Bar");
@@ -36,10 +36,10 @@ public class DisruptorRingBufferTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo?concurrentConsumers=2").to("mock:result");
from("disruptor:bar").to("mock:result");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRouteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRouteTest.java
index 2dd675b..a160ef1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRouteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRouteTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class DisruptorRouteTest extends TestSupport {
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DisruptorRouteTest {
@Test
- public void testDisruptorQueue() throws Exception {
+ void testDisruptorQueue() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
final CamelContext context = new DefaultCamelContext();
@@ -68,7 +69,7 @@ public class DisruptorRouteTest extends TestSupport {
}
@Test
- public void testThatShowsEndpointResolutionIsNotConsistent() throws Exception {
+ void testThatShowsEndpointResolutionIsNotConsistent() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
final CamelContext context = new DefaultCamelContext();
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
index 0ca73c5..9139c0c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
@@ -20,8 +20,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
/**
* Unit test to verify continuing using NOT same thread on the consumer side.
@@ -31,7 +34,7 @@ public class DisruptorShouldNotUseSameThreadTest extends CamelTestSupport {
private static long id;
@Test
- public void testNotUseSameThread() throws Exception {
+ void testNotUseSameThread() throws Exception {
final MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -41,15 +44,15 @@ public class DisruptorShouldNotUseSameThreadTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
final ThreadLocal<String> local = new ThreadLocal<>();
from("direct:start").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
local.set("Hello");
id = Thread.currentThread().getId();
}
@@ -57,9 +60,9 @@ public class DisruptorShouldNotUseSameThreadTest extends CamelTestSupport {
from("disruptor:foo").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
assertEquals(null, local.get());
- assertNotSame("Thread ids should not be same", id, Thread.currentThread().getId());
+ assertNotSame(id, Thread.currentThread().getId(), "Thread ids should not be same");
}
}).to("mock:result");
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java
index 11abd5e..2b262d9 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java
@@ -20,12 +20,14 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorTimeoutDisabledTest extends CamelTestSupport {
@Test
- public void testDisruptorNoTimeout() throws Exception {
+ void testDisruptorNoTimeout() throws Exception {
final Future<String> out = template
.asyncRequestBody("disruptor:foo?timeout=0", "World", String.class);
// use 5 sec failsafe in case something hangs
@@ -33,10 +35,10 @@ public class DisruptorTimeoutDisabledTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").to("mock:before").delay(500).transform(body().prepend("Bye "))
.to("mock:result");
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java
index bfc5a9c..f95428a 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java
@@ -24,14 +24,19 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangeTimedOutException;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorTimeoutTest extends CamelTestSupport {
private int timeout = 100;
@Test
- public void testDisruptorNoTimeout() throws Exception {
+ void testDisruptorNoTimeout() throws Exception {
final MockEndpoint result = getMockEndpoint("mock:result");
result.setExpectedMessageCount(1);
final Future<String> out = template.asyncRequestBody("disruptor:foo", "World", String.class);
@@ -41,7 +46,7 @@ public class DisruptorTimeoutTest extends CamelTestSupport {
}
@Test
- public void testDisruptorTimeout() throws Exception {
+ void testDisruptorTimeout() throws Exception {
final MockEndpoint result = getMockEndpoint("mock:result");
result.setExpectedMessageCount(0);
@@ -55,7 +60,7 @@ public class DisruptorTimeoutTest extends CamelTestSupport {
assertIsInstanceOf(ExchangeTimedOutException.class, e.getCause().getCause());
final DisruptorEndpoint de = (DisruptorEndpoint)context.getRoute("disruptor").getEndpoint();
- assertNotNull("Consumer endpoint cannot be null", de);
+ assertNotNull(de, "Consumer endpoint cannot be null");
//we can't remove the exchange from a Disruptor once it is published, but it should never reach the
//mock:result endpoint because it should be filtered out by the DisruptorConsumer
result.await(1, TimeUnit.SECONDS);
@@ -64,17 +69,17 @@ public class DisruptorTimeoutTest extends CamelTestSupport {
}
@Test
- public void testDisruptorTimeoutWithStoppedRoute() throws Exception {
+ void testDisruptorTimeoutWithStoppedRoute() throws Exception {
context.getRouteController().stopRoute("disruptor");
timeout = 500;
testDisruptorTimeout();
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:foo").routeId("disruptor").to("mock:before").delay(250)
.transform(body().prepend("Bye ")).to("mock:result");
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java
index de10d2c..c9a4247 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Synchronization;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Unit test to verify unit of work with disruptor. That the UnitOfWork is able to route using disruptor but keeping the
@@ -36,7 +38,7 @@ public class DisruptorUnitOfWorkTest extends CamelTestSupport {
private static volatile String lastOne;
@Test
- public void testDisruptorUOW() throws Exception {
+ void testDisruptorUOW() throws Exception {
final NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create();
final MockEndpoint mock = getMockEndpoint("mock:result");
@@ -53,22 +55,22 @@ public class DisruptorUnitOfWorkTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
context.setTracing(true);
from("direct:start").process(new MyUOWProcessor("A")).to("disruptor:foo");
from("disruptor:foo").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
assertEquals(null, sync);
}
}).process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
lastOne = "processor";
}
}).to("mock:result");
@@ -85,7 +87,7 @@ public class DisruptorUnitOfWorkTest extends CamelTestSupport {
}
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
exchange.getUnitOfWork().addSynchronization(new Synchronization() {
@Override
public void onComplete(final Exchange exchange) {
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java
index b3bb892..f24c930 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java
@@ -17,61 +17,55 @@
package org.apache.camel.component.disruptor;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
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.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
- * Tests the WaitStrategy and ClaimStrategy configuration of the disruptor component
+ * Tests the WaitStrategy and ClaimStrategy configuration of the disruptor
+ * component
*/
-@RunWith(value = Parameterized.class)
public class DisruptorWaitClaimStrategyComponentTest extends CamelTestSupport {
private static final Integer VALUE = Integer.valueOf(42);
-
- @EndpointInject("mock:result")
- protected MockEndpoint resultEndpoint;
+ private static final List<String> DISRUPTOR_URIS = new ArrayList<>();
+ private static final List<String> MOCK_URIS = new ArrayList<>();
@Produce
protected ProducerTemplate template;
-
- private final String producerType;
- private final String waitStrategy;
- private String disruptorUri;
-
- public DisruptorWaitClaimStrategyComponentTest(final String waitStrategy, final String producerType) {
-
- this.waitStrategy = waitStrategy;
- this.producerType = producerType;
- }
-
- @Parameters
- public static Collection<String[]> strategies() {
- final List<String[]> strategies = new ArrayList<>();
-
+ @BeforeAll
+ public static void initDisruptorUris() {
for (final DisruptorWaitStrategy waitStrategy : DisruptorWaitStrategy.values()) {
for (final DisruptorProducerType producerType : DisruptorProducerType.values()) {
- strategies.add(new String[] {waitStrategy.name(), producerType.name()});
+ String disruptorUri = "disruptor:test?waitStrategy=" + waitStrategy + "&producerType=" + producerType;
+ DISRUPTOR_URIS.add(disruptorUri);
+ MOCK_URIS.add("mock:result-" + waitStrategy + "-" + producerType);
}
}
+ }
- return strategies;
+ public static List<Arguments> getTestArguments() {
+ List<Arguments> arguments = new ArrayList<Arguments>();
+ for (int i = 0; i < DISRUPTOR_URIS.size(); i++) {
+ arguments.add(Arguments.of(DISRUPTOR_URIS.get(i), MOCK_URIS.get(i)));
+ }
+ return arguments;
}
+ @ParameterizedTest
+ @MethodSource("getTestArguments")
+ void testProduce(String disruptorUri, String mockUri) throws InterruptedException {
- @Test
- public void testProduce() throws InterruptedException {
+ MockEndpoint resultEndpoint = context.getEndpoint(mockUri, MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(VALUE);
resultEndpoint.setExpectedMessageCount(1);
@@ -81,16 +75,14 @@ public class DisruptorWaitClaimStrategyComponentTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
}
-
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
-
- disruptorUri = "disruptor:test?waitStrategy=" + waitStrategy + "&producerType=" + producerType;
-
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
- from(disruptorUri).to("mock:result");
+ public void configure() {
+ for (int i = 0; i < DISRUPTOR_URIS.size(); i++) {
+ from(DISRUPTOR_URIS.get(i)).to(MOCK_URIS.get(i));
+ }
}
};
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java
index b6aa7a1..f3fc20c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java
@@ -21,17 +21,19 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.WaitForTaskToComplete;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorWaitForTaskAsPropertyTest extends CamelTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final Exchange out = template.send("direct:start", new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
exchange.getIn().setBody("Hello World");
exchange.setPattern(ExchangePattern.InOut);
exchange.setProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.IfReplyExpected);
@@ -43,7 +45,7 @@ public class DisruptorWaitForTaskAsPropertyTest extends CamelTestSupport {
}
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final Exchange out = template.send("direct:start", new Processor() {
@@ -62,10 +64,10 @@ public class DisruptorWaitForTaskAsPropertyTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo");
from("disruptor:foo").transform(constant("Bye World")).to("mock:result");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java
index 01f7e26..786a53d 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java
@@ -22,15 +22,19 @@ import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.SynchronizationAdapter;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorWaitForTaskCompleteOnCompletionTest extends CamelTestSupport {
private static String done = "";
@Test
- public void testAlways() throws Exception {
+ void testAlways() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(0);
try {
@@ -48,15 +52,15 @@ public class DisruptorWaitForTaskCompleteOnCompletionTest extends CamelTestSuppo
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
errorHandler(defaultErrorHandler().maximumRedeliveries(3).redeliveryDelay(0));
from("direct:start").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
exchange.adapt(ExtendedExchange.class).addOnCompletion(new SynchronizationAdapter() {
@Override
public void onDone(final Exchange exchange) {
@@ -66,14 +70,14 @@ public class DisruptorWaitForTaskCompleteOnCompletionTest extends CamelTestSuppo
}
}).to("disruptor:foo?waitForTaskToComplete=Always").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
done += "B";
}
}).to("mock:result");
from("disruptor:foo").errorHandler(noErrorHandler()).process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
done = done + "C";
}
}).throwException(new IllegalArgumentException("Forced"));
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java
index 9a06f06..eab31cf 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java
@@ -20,12 +20,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorWaitForTaskCompleteTest extends CamelTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final String out = template.requestBody("direct:start", "Hello World", String.class);
@@ -35,7 +37,7 @@ public class DisruptorWaitForTaskCompleteTest extends CamelTestSupport {
}
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
// we send an in only but we use Always to wait for it to complete
@@ -53,10 +55,10 @@ public class DisruptorWaitForTaskCompleteTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo?waitForTaskToComplete=Always");
from("disruptor:foo?waitForTaskToComplete=Always").transform(constant("Bye World"))
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java
index ef08b73..91901d9 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java
@@ -20,13 +20,15 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorWaitForTaskIfReplyExpectedTest extends CamelTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final String out = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
@@ -35,7 +37,7 @@ public class DisruptorWaitForTaskIfReplyExpectedTest extends CamelTestSupport {
}
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final Exchange out = template.send("direct:start", new Processor() {
@Override
@@ -54,10 +56,10 @@ public class DisruptorWaitForTaskIfReplyExpectedTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo?waitForTaskToComplete=IfReplyExpected");
from("disruptor:foo").transform(constant("Bye World")).to("mock:result");
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java
index 5f8acea..32a2ff1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java
@@ -24,8 +24,11 @@ import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.SynchronizationAdapter;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DisruptorWaitForTaskNeverOnCompletionTest extends CamelTestSupport {
@@ -34,7 +37,7 @@ public class DisruptorWaitForTaskNeverOnCompletionTest extends CamelTestSupport
private final CountDownLatch latch = new CountDownLatch(1);
@Test
- public void testNever() throws Exception {
+ void testNever() throws Exception {
getMockEndpoint("mock:dead").expectedMessageCount(0);
getMockEndpoint("mock:result").expectedMessageCount(1);
@@ -48,15 +51,15 @@ public class DisruptorWaitForTaskNeverOnCompletionTest extends CamelTestSupport
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(3).redeliveryDelay(0));
from("direct:start").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
exchange.adapt(ExtendedExchange.class).addOnCompletion(new SynchronizationAdapter() {
@Override
public void onDone(final Exchange exchange) {
@@ -67,14 +70,14 @@ public class DisruptorWaitForTaskNeverOnCompletionTest extends CamelTestSupport
}
}).to("disruptor:foo?waitForTaskToComplete=Never").process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
done = done + "B";
}
}).to("mock:result");
from("disruptor:foo").errorHandler(noErrorHandler()).delay(1000).process(new Processor() {
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
done = done + "C";
}
}).throwException(new IllegalArgumentException("Forced"));
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java
index 939d28f..7496eb3 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java
@@ -20,12 +20,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorWaitForTaskNeverTest extends CamelTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final String out = template.requestBody("direct:start", "Hello World", String.class);
@@ -36,7 +38,7 @@ public class DisruptorWaitForTaskNeverTest extends CamelTestSupport {
}
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final Exchange out = template.send("direct:start", new Processor() {
@@ -54,10 +56,10 @@ public class DisruptorWaitForTaskNeverTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor:foo?waitForTaskToComplete=Never");
from("disruptor:foo?waitForTaskToComplete=Never").transform(constant("Bye World"))
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java
index fffd3a9..251d312 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java
@@ -17,17 +17,17 @@
package org.apache.camel.component.disruptor;
import com.lmax.disruptor.WaitStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests correct creation of all supposedly possible wait strategies.
*/
public class DisruptorWaitStrategyCreationTest {
@Test
- public void testCreateWaitStrategyInstance() throws Exception {
+ void testCreateWaitStrategyInstance() throws Exception {
for (final DisruptorWaitStrategy strategy : DisruptorWaitStrategy.values()) {
final WaitStrategy waitStrategyInstance = strategy.createWaitStrategyInstance();
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
index 3d9e8cb..c811032 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
@@ -20,21 +20,24 @@ import org.apache.camel.Exchange;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class FileDisruptorShutdownCompleteAllTasksTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/disruptor");
super.setUp();
}
@Test
- public void testShutdownCompleteAllTasks() throws Exception {
+ void testShutdownCompleteAllTasks() throws Exception {
final String url = "file:target/disruptor";
template.sendBodyAndHeader(url, "A", Exchange.FILE_NAME, "a.txt");
template.sendBodyAndHeader(url, "B", Exchange.FILE_NAME, "b.txt");
@@ -47,7 +50,7 @@ public class FileDisruptorShutdownCompleteAllTasksTest extends CamelTestSupport
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from(url).routeId("route1")
// let it complete all tasks during shutdown
.shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks).to("log:delay").delay(1000)
@@ -67,6 +70,6 @@ public class FileDisruptorShutdownCompleteAllTasksTest extends CamelTestSupport
context.stop();
// should route all 5
- assertEquals("Should complete all messages", 5, bar.getReceivedCounter());
+ assertEquals(5, bar.getReceivedCounter(), "Should complete all messages");
}
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java
index 1685074..84b0542 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.ShutdownRoute;
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.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Tests that multicast functionality works correctly
@@ -46,7 +46,7 @@ public class MulticastDisruptorComponentTest extends CamelTestSupport {
// private ThreadCounter threadCounter = new ThreadCounter();
@Test
- public void testMulticastProduce() throws InterruptedException {
+ void testMulticastProduce() throws InterruptedException {
resultEndpoint1.expectedBodiesReceived(VALUE);
resultEndpoint1.setExpectedMessageCount(1);
@@ -63,7 +63,7 @@ public class MulticastDisruptorComponentTest extends CamelTestSupport {
//
// @Test
-// public void testAsynchronous() throws InterruptedException {
+// void testAsynchronous() throws InterruptedException {
// threadCounter.reset();
//
// int messagesSent = 1000;
@@ -84,7 +84,7 @@ public class MulticastDisruptorComponentTest extends CamelTestSupport {
// }
//
// @Test
-// public void testMultipleConsumers() throws InterruptedException {
+// void testMultipleConsumers() throws InterruptedException {
// threadCounter.reset();
//
// int messagesSent = 1000;
@@ -109,10 +109,10 @@ public class MulticastDisruptorComponentTest extends CamelTestSupport {
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor:test?multipleConsumers=true").to("mock:result1")
.shutdownRoute(ShutdownRoute.Defer);
from("disruptor:test?multipleConsumers=true").to("mock:result2")
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
index 8c5137d..4d12b43 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
@@ -35,12 +35,11 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.seda.SedaEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* This class does not perform any functional test, but instead makes a comparison between the performance of the
@@ -48,8 +47,7 @@ import org.junit.runners.Parameterized;
* <p/>
* As memory management may have great impact on the results, it is adviced to run this test with a large, fixed heap (e.g. run with -Xmx1024m -Xms1024m JVM parameters)
*/
-@Ignore
-@RunWith(value = Parameterized.class)
+@Disabled
public class SedaDisruptorCompareTest extends CamelTestSupport {
// Use '0' for default value, '1'+ for specific value to be used by both SEDA and DISRUPTOR.
private static final int SIZE_PARAMETER_VALUE = 1024;
@@ -60,32 +58,16 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
private static final long[] SEDA_SIZE_HISTOGRAM_BOUNDS = generateLinearHistogramBounds(
SIZE_PARAMETER_VALUE == 0 ? SPEED_TEST_EXCHANGE_COUNT : SIZE_PARAMETER_VALUE, 10);
+ private static Collection<Object[]> tPARAMETERS;
+
@Produce
protected ProducerTemplate producerTemplate;
- private final ExchangeAwaiter[] exchangeAwaiters;
- private final String componentName;
- private final String endpointUri;
- private final int amountProducers;
- private final long[] sizeHistogramBounds;
-
private final Queue<Integer> endpointSizeQueue = new ConcurrentLinkedQueue<>();
-
- public SedaDisruptorCompareTest(final String componentName, final String endpointUri,
- final int amountProducers, final int amountConsumers,
- final int concurrentConsumerThreads, final long[] sizeHistogramBounds) {
- this.componentName = componentName;
- this.endpointUri = endpointUri;
- this.amountProducers = amountProducers;
- this.sizeHistogramBounds = sizeHistogramBounds;
- exchangeAwaiters = new ExchangeAwaiter[amountConsumers];
- for (int i = 0; i < amountConsumers; ++i) {
- exchangeAwaiters[i] = new ExchangeAwaiter(SPEED_TEST_EXCHANGE_COUNT);
- }
- }
- @BeforeClass
+ @BeforeAll
public static void legend() {
+ tPARAMETERS = parameters();
System.out.println("-----------------------");
System.out.println("- Tests output legend -");
System.out.println("-----------------------");
@@ -111,8 +93,6 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
return bounds;
}
-
-
private static int singleProducer() {
return 1;
}
@@ -121,12 +101,16 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
return 4;
}
- private static int singleConsumer() {
- return 1;
+ private static ExchangeAwaiter[] singleConsumer() {
+ return new ExchangeAwaiter[] {new ExchangeAwaiter(SPEED_TEST_EXCHANGE_COUNT)};
}
- private static int multipleConsumers() {
- return 4;
+ private static ExchangeAwaiter[] multipleConsumers() {
+ ExchangeAwaiter[] exchangeAwaiters = new ExchangeAwaiter[4];
+ for (int i = 0; i < exchangeAwaiters.length; ++i) {
+ exchangeAwaiters[i] = new ExchangeAwaiter(SPEED_TEST_EXCHANGE_COUNT);
+ }
+ return exchangeAwaiters;
}
private static int singleConcurrentConsumerThread() {
@@ -137,7 +121,10 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
return 2;
}
- @Parameterized.Parameters(name = "{index}: {0}")
+ public static Collection<Object[]> getTestParameters() {
+ return tPARAMETERS;
+ }
+
public static Collection<Object[]> parameters() {
final List<Object[]> parameters = new ArrayList<>();
@@ -171,12 +158,21 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
addParameterPair(parameters, multipleProducers(), multipleConsumers(), singleConcurrentConsumerThread());
addParameterPair(parameters, multipleProducers(), multipleConsumers(), multipleConcurrentConsumerThreads());
+ // Make endpointUris unique
+ int i = 0;
+ for (Object[] params : parameters) {
+ String endpointUri = (String)params[1];
+ String uniqueEndpointUri = endpointUri.replaceFirst("([a-z]+):([^?]+)\\?(.*)", "$1:$2-" + i + "?$3");
+ params[1] = uniqueEndpointUri;
+ i++;
+ }
+
return parameters;
}
private static void addParameterPair(final List<Object[]> parameters, final int producers,
- final int consumers, final int parallelConsumerThreads) {
- final String multipleConsumerOption = consumers > 1 ? "multipleConsumers=true" : "";
+ final ExchangeAwaiter[] consumers, final int parallelConsumerThreads) {
+ final String multipleConsumerOption = consumers.length > 1 ? "multipleConsumers=true" : "";
final String concurrentConsumerOptions = parallelConsumerThreads > 1 ? "concurrentConsumers=" + parallelConsumerThreads : "";
final String sizeOption = SIZE_PARAMETER_VALUE > 0 ? "size=" + SIZE_PARAMETER_VALUE : "";
final String sizeOptionSeda = SIZE_PARAMETER_VALUE > 0 ? "&blockWhenFull=true" : "";
@@ -215,18 +211,21 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
consumers, parallelConsumerThreads, DISRUPTOR_SIZE_HISTOGRAM_BOUNDS});
}
- @Test
- public void speedTestDisruptor() throws InterruptedException {
+ @ParameterizedTest
+ @MethodSource("getTestParameters")
+ void speedTestDisruptor(final String componentName, final String endpointUri, final int amountProducers, final ExchangeAwaiter[] exchangeAwaiters,
+ final int concurrentConsumerThreads, final long[] sizeHistogramBounds)
+ throws InterruptedException {
System.out.println("Warming up for test of: " + componentName);
- performTest(true);
+ performTest(componentName, endpointUri, true, exchangeAwaiters, amountProducers, sizeHistogramBounds);
System.out.println("Starting real test of: " + componentName);
forceGC();
Thread.sleep(1000);
- performTest(false);
+ performTest(componentName, endpointUri, false, exchangeAwaiters, amountProducers, sizeHistogramBounds);
}
private void forceGC() {
@@ -236,13 +235,13 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
System.gc();
}
- private void resetExchangeAwaiters() {
+ private void resetExchangeAwaiters(ExchangeAwaiter[] exchangeAwaiters) {
for (final ExchangeAwaiter exchangeAwaiter : exchangeAwaiters) {
exchangeAwaiter.reset();
}
}
- private void awaitExchangeAwaiters() throws InterruptedException {
+ private void awaitExchangeAwaiters(String componentName, ExchangeAwaiter[] exchangeAwaiters) throws InterruptedException {
for (final ExchangeAwaiter exchangeAwaiter : exchangeAwaiters) {
while (!exchangeAwaiter.awaitMessagesReceived(10, TimeUnit.SECONDS)) {
System.err.println(
@@ -252,7 +251,7 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
}
}
- private void outputExchangeAwaitersResult(final long start) throws InterruptedException {
+ private void outputExchangeAwaitersResult(String componentName, final long start, ExchangeAwaiter[] exchangeAwaiters) throws InterruptedException {
for (final ExchangeAwaiter exchangeAwaiter : exchangeAwaiters) {
final long stop = exchangeAwaiter.getCountDownReachedTime();
final Histogram histogram = exchangeAwaiter.getLatencyHistogram();
@@ -262,12 +261,12 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
}
}
- private void performTest(final boolean warmup) throws InterruptedException {
- resetExchangeAwaiters();
+ private void performTest(String componentName, String endpointUri, final boolean warmup, ExchangeAwaiter[] exchangeAwaiters, int amountProducers, long[] sizeHistogramBounds) throws InterruptedException {
+ resetExchangeAwaiters(exchangeAwaiters);
final ProducerThread[] producerThread = new ProducerThread[amountProducers];
for (int i = 0; i < producerThread.length; ++i) {
- producerThread[i] = new ProducerThread(SPEED_TEST_EXCHANGE_COUNT / amountProducers);
+ producerThread[i] = new ProducerThread(SPEED_TEST_EXCHANGE_COUNT / amountProducers, endpointUri);
}
ExecutorService monitoring = null;
@@ -280,11 +279,11 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
element.start();
}
- awaitExchangeAwaiters();
+ awaitExchangeAwaiters(componentName, exchangeAwaiters);
if (!warmup) {
- outputExchangeAwaitersResult(start);
- uninstallSizeMonitoring(monitoring);
+ outputExchangeAwaitersResult(componentName, start, exchangeAwaiters);
+ uninstallSizeMonitoring(monitoring, sizeHistogramBounds);
}
}
@@ -315,7 +314,7 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
return service;
}
- private void uninstallSizeMonitoring(final ExecutorService monitoring) {
+ private void uninstallSizeMonitoring(final ExecutorService monitoring, long[] sizeHistogramBounds) {
if (monitoring != null) {
monitoring.shutdownNow();
}
@@ -327,12 +326,16 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
- for (final ExchangeAwaiter exchangeAwaiter : exchangeAwaiters) {
- from(endpointUri).process(exchangeAwaiter);
+ public void configure() {
+ for (Object[] parameters : tPARAMETERS) {
+ ExchangeAwaiter[] exchangeAwaiters = (ExchangeAwaiter[])parameters[3];
+ String endpointUri = (String)parameters[1];
+ for (final ExchangeAwaiter exchangeAwaiter : exchangeAwaiters) {
+ from(endpointUri).process(exchangeAwaiter);
+ }
}
}
};
@@ -372,7 +375,7 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
}
@Override
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
final long sentTimeNs = exchange.getIn().getBody(Long.class);
latencyQueue.offer(Long.valueOf(System.nanoTime() - sentTimeNs));
@@ -403,10 +406,12 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
private final int totalMessageCount;
private int producedMessageCount;
+ private String endpointUri;
- ProducerThread(final int totalMessageCount) {
+ ProducerThread(final int totalMessageCount, String endpointUri) {
super("TestDataProducerThread");
this.totalMessageCount = totalMessageCount;
+ this.endpointUri = endpointUri;
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java
index 7d4ff8a..dde2ffb 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.service.ServiceHelper;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
public abstract class AbstractVmTestSupport extends CamelTestSupport {
@@ -31,7 +31,7 @@ public abstract class AbstractVmTestSupport extends CamelTestSupport {
protected ProducerTemplate template2;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
context2 = new DefaultCamelContext();
@@ -48,14 +48,14 @@ public abstract class AbstractVmTestSupport extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
ServiceHelper.stopService(template2);
context2.stop();
super.tearDown();
}
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return null;
}
}
\ No newline at end of file
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
index e752003..65f34cf 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
@@ -21,8 +21,11 @@ import java.util.Iterator;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.disruptor.DisruptorComponent;
import org.apache.camel.component.disruptor.DisruptorReference;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
*
@@ -30,7 +33,7 @@ import org.junit.Test;
public class DisruptorVmComponentReferenceEndpointTest extends CamelTestSupport {
@Test
- public void testDisruptorVmComponentReference() throws Exception {
+ void testDisruptorVmComponentReference() throws Exception {
DisruptorVmComponent vm = context.getComponent("disruptor-vm", DisruptorVmComponent.class);
String key = DisruptorComponent.getDisruptorKey("disruptor-vm://foo");
@@ -40,7 +43,7 @@ public class DisruptorVmComponentReferenceEndpointTest extends CamelTestSupport
// add a second consumer on the endpoint
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?blockWhenFull=true").routeId("foo2").to("mock:foo2");
}
});
@@ -69,10 +72,10 @@ public class DisruptorVmComponentReferenceEndpointTest extends CamelTestSupport
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo").routeId("foo").to("mock:foo");
from("disruptor-vm:bar").routeId("bar").to("mock:bar");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
index bfb8638..91e3175 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.disruptor.vm;
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 DisruptorVmConcurrentConsumersTest extends AbstractVmTestSupport {
@Test
- public void testSendToSeda() throws Exception {
+ void testSendToSeda() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -33,10 +33,10 @@ public class DisruptorVmConcurrentConsumersTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?concurrentConsumers=5").to("mock:result");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java
index c06cfcb..6720502 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
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;
public class DisruptorVmDifferentOptionsOnConsumerAndProducerTest extends AbstractVmTestSupport {
@Test
- public void testSendToDisruptorVm() throws Exception {
+ void testSendToDisruptorVm() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedBodiesReceived("Hello World");
@@ -33,14 +35,14 @@ public class DisruptorVmDifferentOptionsOnConsumerAndProducerTest extends Abstra
assertMockEndpointsSatisfied();
// check the camel context of the exchange
- assertEquals("Get a wrong context. ", context, result.getExchanges().get(0).getContext());
+ assertEquals(context, result.getExchanges().get(0).getContext(), "Got a wrong context.");
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?concurrentConsumers=5")
.to("mock:result");
}
@@ -48,10 +50,10 @@ public class DisruptorVmDifferentOptionsOnConsumerAndProducerTest extends Abstra
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start")
.to("disruptor-vm:foo");
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
index 2f982a8..786edb8 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
@@ -18,14 +18,16 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.apache.camel.test.junit5.TestSupport;
+import org.junit.jupiter.api.Test;
public class DisruptorVmInOnlyChainedTest extends AbstractVmTestSupport {
@Test
- public void testInOnlyDisruptorVmChained() throws Exception {
+ void testInOnlyDisruptorVmChained() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("start");
- resolveMandatoryEndpoint(context2, "mock:b", MockEndpoint.class).expectedBodiesReceived("start-a");
+
+ TestSupport.resolveMandatoryEndpoint(context2, "mock:b", MockEndpoint.class).expectedBodiesReceived("start-a");
getMockEndpoint("mock:c").expectedBodiesReceived("start-a-b");
template.sendBody("disruptor-vm:a", "start");
@@ -35,10 +37,10 @@ public class DisruptorVmInOnlyChainedTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:a").to("mock:a").setBody(simple("${body}-a")).to("disruptor-vm:b");
from("disruptor-vm:c").to("mock:c").setBody(simple("${body}-c"));
@@ -47,10 +49,10 @@ public class DisruptorVmInOnlyChainedTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:b").to("mock:b").setBody(simple("${body}-b")).to("disruptor-vm:c");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
index a886d27..00e7657 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class DisruptorVmInOnlyTest extends AbstractVmTestSupport {
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
template2.sendBody("direct:start", "Hello World");
@@ -31,20 +31,20 @@ public class DisruptorVmInOnlyTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo").to("mock:result");
}
};
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:foo");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
index 17bba7b..42c3d4e 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
@@ -18,14 +18,17 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.apache.camel.test.junit5.TestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorVmInOutChainedTest extends AbstractVmTestSupport {
@Test
- public void testInOutDisruptorVmChained() throws Exception {
+ void testInOutDisruptorVmChained() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("start");
- resolveMandatoryEndpoint(context2, "mock:b", MockEndpoint.class).expectedBodiesReceived("start-a");
+ TestSupport.resolveMandatoryEndpoint(context2, "mock:b", MockEndpoint.class).expectedBodiesReceived("start-a");
getMockEndpoint("mock:c").expectedBodiesReceived("start-a-b");
String reply = template2.requestBody("disruptor-vm:a", "start", String.class);
@@ -35,10 +38,10 @@ public class DisruptorVmInOutChainedTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:a").to("mock:a").transform(simple("${body}-a")).to("disruptor-vm:b");
from("disruptor-vm:c").to("mock:c").transform(simple("${body}-c"));
@@ -47,10 +50,10 @@ public class DisruptorVmInOutChainedTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:b").to("mock:b").transform(simple("${body}-b")).to("disruptor-vm:c");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java
index b6ca9b2..927e921 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java
@@ -20,12 +20,17 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.StopWatch;
-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;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorVmInOutChainedTimeoutTest extends AbstractVmTestSupport {
@Test
- public void testDisruptorVmInOutChainedTimeout() throws Exception {
+ void testDisruptorVmInOutChainedTimeout() throws Exception {
StopWatch watch = new StopWatch();
try {
@@ -40,14 +45,14 @@ public class DisruptorVmInOutChainedTimeoutTest extends AbstractVmTestSupport {
long delta = watch.taken();
- assertTrue("Should be faster than 1 sec, was: " + delta, delta < 1100);
+ assertTrue(delta < 1100, "Should be faster than 1 sec, was: " + delta);
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:b")
.to("mock:b")
.delay(500)
@@ -57,10 +62,10 @@ public class DisruptorVmInOutChainedTimeoutTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
errorHandler(noErrorHandler());
from("disruptor-vm:a")
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
index adb05a0..0cf4d08 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
@@ -17,12 +17,14 @@
package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorVmInOutTest extends AbstractVmTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
String out = template2.requestBody("direct:start", "Hello World", String.class);
@@ -32,20 +34,20 @@ public class DisruptorVmInOutTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo").transform(constant("Bye World")).to("mock:result");
}
};
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:foo");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
index a6e152a..ade4b69 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
@@ -18,12 +18,16 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-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.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorVmInOutWithErrorTest extends AbstractVmTestSupport {
@Test
- public void testInOutWithError() throws Exception {
+ void testInOutWithError() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(0);
try {
@@ -38,10 +42,10 @@ public class DisruptorVmInOutWithErrorTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo").transform(constant("Bye World"))
.throwException(new IllegalArgumentException("Damn I cannot do this"))
.to("mock:result");
@@ -50,10 +54,10 @@ public class DisruptorVmInOutWithErrorTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:foo");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
index 66ee29b..8de6905 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
*
@@ -27,7 +27,7 @@ import org.junit.Test;
public class DisruptorVmMultipleConsumersIssueTest extends CamelTestSupport {
@Test
- public void testDisruptorVmMultipleConsumersIssue() throws Exception {
+ void testDisruptorVmMultipleConsumersIssue() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:b").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:c").expectedBodiesReceived("Hello World");
@@ -41,10 +41,10 @@ public class DisruptorVmMultipleConsumersIssueTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:inbox")
.to(ExchangePattern.InOut, "disruptor-vm:foo?timeout=5000")
.to("mock:done");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java
index 6e5e6dd..b2844d1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.disruptor.vm;
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 DisruptorVmMultipleContextsStartStopTest extends AbstractVmTestSupport {
@Test
- public void testStartStop() throws Exception {
+ void testStartStop() throws Exception {
/* Check that contexts are communicated */
MockEndpoint mock = context2.getEndpoint("mock:result", MockEndpoint.class);
mock.expectedMessageCount(1);
@@ -42,20 +42,20 @@ public class DisruptorVmMultipleContextsStartStopTest extends AbstractVmTestSupp
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:test").to("disruptor-vm:foo");
}
};
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo").to("mock:result");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java
index 0765349..5c8f7b9 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.disruptor.vm;
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 DisruptorVmQueueTest extends AbstractVmTestSupport {
@Test
- public void testQueue() throws Exception {
+ void testQueue() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World", "Goodday World", "Bar");
@@ -34,20 +34,20 @@ public class DisruptorVmQueueTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:bar").to("mock:result");
}
};
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?size=20&concurrentConsumers=2").to("mock:result");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
index 0ce3f24..e0e7e23 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Unit test to verify continuing using NOT same thread on the consumer side.
@@ -31,7 +34,7 @@ public class DisruptorVmShouldNotUseSameThreadTest extends AbstractVmTestSupport
private final ThreadLocal<String> local = new ThreadLocal<>();
@Test
- public void testNotUseSameThread() throws Exception {
+ void testNotUseSameThread() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -41,13 +44,13 @@ public class DisruptorVmShouldNotUseSameThreadTest extends AbstractVmTestSupport
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
assertNull(local.get());
- assertNotSame("Thread is should not be same", id, Thread.currentThread().getId());
+ assertNotSame(id, Thread.currentThread().getId(), "Thread is should not be same");
}
}).to("mock:result");
}
@@ -55,12 +58,12 @@ public class DisruptorVmShouldNotUseSameThreadTest extends AbstractVmTestSupport
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
local.set("Hello");
id = Thread.currentThread().getId();
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
index 1829f57..3909731 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.BindToRegistry;
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 DisruptorVmSplitterTest extends AbstractVmTestSupport {
@@ -30,7 +30,7 @@ public class DisruptorVmSplitterTest extends AbstractVmTestSupport {
private SplitWordsBean swb = new SplitWordsBean();
@Test
- public void testSplitUsingMethodCall() throws Exception {
+ void testSplitUsingMethodCall() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived("Claus", "James", "Willem");
@@ -41,20 +41,20 @@ public class DisruptorVmSplitterTest extends AbstractVmTestSupport {
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:server").split().method("splitterBean", "splitWords").to("mock:result");
}
};
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:server");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java
index 80148b8..f9ca5f1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java
@@ -21,12 +21,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class DisruptorVmTimeoutIssueTest extends AbstractVmTestSupport {
@Test
- public void testDisruptorVmTimeoutWithAnotherDisruptorVm() throws Exception {
+ void testDisruptorVmTimeoutWithAnotherDisruptorVm() throws Exception {
try {
template2.requestBody("disruptor-vm:start1?timeout=4000", "Hello");
fail("Should have thrown an exception");
@@ -38,7 +42,7 @@ public class DisruptorVmTimeoutIssueTest extends AbstractVmTestSupport {
}
@Test
- public void testDisruptorVmTimeoutWithProcessor() throws Exception {
+ void testDisruptorVmTimeoutWithProcessor() throws Exception {
try {
template2.requestBody("disruptor-vm:start2?timeout=4000", "Hello");
fail("Should have thrown an exception");
@@ -50,10 +54,10 @@ public class DisruptorVmTimeoutIssueTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:end")
.delay(3000).transform().constant("Bye World");
}
@@ -61,10 +65,10 @@ public class DisruptorVmTimeoutIssueTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
errorHandler(noErrorHandler());
from("disruptor-vm:start1?timeout=4000")
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
index 5e858f1..76064b2 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class DisruptorVmUseSameQueueTest extends AbstractVmTestSupport {
@Test
- public void testDisruptorVmUseSameQueue() throws Exception {
+ void testDisruptorVmUseSameQueue() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(2);
template2.sendBody("direct:start", "Hello World");
@@ -32,20 +32,20 @@ public class DisruptorVmUseSameQueueTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?size=500").to("mock:result");
}
};
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:foo");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
index b2865bb..026b548 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
@@ -20,12 +20,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DisruptorVmWaitForTaskCompleteTest extends AbstractVmTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
String out = template2.requestBody("direct:start", "Hello World", String.class);
@@ -35,7 +37,7 @@ public class DisruptorVmWaitForTaskCompleteTest extends AbstractVmTestSupport {
}
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
// we send an in only but we use Always to wait for it to complete
@@ -52,10 +54,10 @@ public class DisruptorVmWaitForTaskCompleteTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?waitForTaskToComplete=Always").transform(constant("Bye World"))
.to("mock:result");
}
@@ -63,10 +65,10 @@ public class DisruptorVmWaitForTaskCompleteTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:foo?waitForTaskToComplete=Always");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
index 5d33429..d344b01 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
@@ -20,12 +20,15 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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.assertNull;
public class DisruptorVmWaitForTaskIfReplyExpectedTest extends AbstractVmTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
String out = template2.requestBody("direct:start", "Hello World", String.class);
@@ -35,7 +38,7 @@ public class DisruptorVmWaitForTaskIfReplyExpectedTest extends AbstractVmTestSup
}
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
Exchange out = template2.send("direct:start", new Processor() {
@@ -52,10 +55,10 @@ public class DisruptorVmWaitForTaskIfReplyExpectedTest extends AbstractVmTestSup
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?waitForTaskToComplete=IfReplyExpected")
.transform(constant("Bye World")).to("mock:result");
}
@@ -63,10 +66,10 @@ public class DisruptorVmWaitForTaskIfReplyExpectedTest extends AbstractVmTestSup
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:foo?waitForTaskToComplete=IfReplyExpected");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
index 8904d34..4e732c2 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
@@ -20,12 +20,15 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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.assertNull;
public class DisruptorVmWaitForTaskNewerTest extends AbstractVmTestSupport {
@Test
- public void testInOut() throws Exception {
+ void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
String out = template2.requestBody("direct:start", "Hello World", String.class);
@@ -36,7 +39,7 @@ public class DisruptorVmWaitForTaskNewerTest extends AbstractVmTestSupport {
}
@Test
- public void testInOnly() throws Exception {
+ void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
Exchange out = template2.send("direct:start", new Processor() {
@@ -53,10 +56,10 @@ public class DisruptorVmWaitForTaskNewerTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?waitForTaskToComplete=Never").transform(constant("Bye World"))
.to("mock:result");
}
@@ -64,10 +67,10 @@ public class DisruptorVmWaitForTaskNewerTest extends AbstractVmTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+ protected RouteBuilder createRouteBuilderForSecondContext() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("disruptor-vm:foo?waitForTaskToComplete=Never");
}
};
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java
index 73b5b39..86fe747 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java
@@ -19,8 +19,12 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
/**
*
@@ -28,7 +32,7 @@ import org.junit.Test;
public class SameDisruptorVmQueueSizeAndNoSizeTest extends CamelTestSupport {
@Test
- public void testSameQueue() throws Exception {
+ void testSameQueue() throws Exception {
for (int i = 0; i < 128; i++) {
template.sendBody("disruptor-vm:foo?blockWhenFull=false", "" + i);
}
@@ -43,7 +47,7 @@ public class SameDisruptorVmQueueSizeAndNoSizeTest extends CamelTestSupport {
}
@Test
- public void testSameQueueDifferentSize() throws Exception {
+ void testSameQueueDifferentSize() throws Exception {
try {
template.sendBody("disruptor-vm:foo?size=256", "Should fail");
fail("Should fail");
@@ -56,7 +60,7 @@ public class SameDisruptorVmQueueSizeAndNoSizeTest extends CamelTestSupport {
}
@Test
- public void testSameQueueDifferentSizeBar() throws Exception {
+ void testSameQueueDifferentSizeBar() throws Exception {
try {
template.sendBody("disruptor-vm:bar?size=256", "Should fail");
fail("Should fail");
@@ -68,10 +72,10 @@ public class SameDisruptorVmQueueSizeAndNoSizeTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("disruptor-vm:foo?size=128&blockWhenFull=false").routeId("foo").noAutoStartup()
.to("mock:foo");