You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2021/03/23 15:34:33 UTC
[camel] branch master updated (35dd548 -> ca31a03)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 35dd548 Upgrade to chunk 3.6.0
new ea2d17c Make camel-sql tests run in parallel
new ca31a03 Make camel-jdbc tests run in parallel
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-jdbc/pom.xml | 2 ++
.../camel/component/jdbc/AbstractJdbcTestSupport.java | 1 +
components/camel-sql/pom.xml | 4 ++++
.../component/sql/SpringSqlEndpointLikeTest.java | 3 +--
.../camel/component/sql/SpringSqlMultilineTest.java | 3 +--
.../sql/SqlConsumerDeleteBatchCompleteTest.java | 1 +
.../component/sql/SqlConsumerDeleteFailedTest.java | 1 +
.../camel/component/sql/SqlConsumerDeleteTest.java | 1 +
.../component/sql/SqlConsumerDeleteTransformTest.java | 1 +
.../sql/SqlConsumerDynamicParameterTest.java | 1 +
.../sql/SqlConsumerMaxMessagesPerPollTest.java | 1 +
.../sql/SqlConsumerOutputTypeSelectListTest.java | 1 +
.../SqlConsumerOutputTypeSelectListWithClassTest.java | 1 +
.../sql/SqlConsumerOutputTypeSelectOneTest.java | 1 +
.../sql/SqlConsumerOutputTypeStreamListTest.java | 1 +
.../apache/camel/component/sql/SqlConsumerTest.java | 1 +
.../camel/component/sql/SqlDataSourceRefTest.java | 1 +
.../apache/camel/component/sql/SqlDataSourceTest.java | 1 +
.../camel/component/sql/SqlEndpointLikeTest.java | 1 +
.../apache/camel/component/sql/SqlEndpointTest.java | 1 +
.../camel/component/sql/SqlPreserveHeaderTest.java | 1 +
.../SqlProducerAlwaysPopulateStatementFalseTest.java | 1 +
.../sql/SqlProducerAlwaysPopulateStatementTest.java | 1 +
.../camel/component/sql/SqlProducerAndInTest.java | 1 +
.../component/sql/SqlProducerConcurrentTest.java | 1 +
.../camel/component/sql/SqlProducerInMultiTest.java | 1 +
.../apache/camel/component/sql/SqlProducerInTest.java | 1 +
.../component/sql/SqlProducerInsertNullTest.java | 1 +
.../camel/component/sql/SqlProducerJSONTest.java | 1 +
.../sql/SqlProducerNamedParameterNotExistTest.java | 1 +
.../component/sql/SqlProducerNamedParameterTest.java | 1 +
.../component/sql/SqlProducerNamedParametersTest.java | 2 +-
.../camel/component/sql/SqlProducerNoopTest.java | 1 +
.../component/sql/SqlProducerNullBodyHeaderTest.java | 1 +
.../camel/component/sql/SqlProducerNullBodyTest.java | 1 +
.../component/sql/SqlProducerOutputHeaderTest.java | 1 +
.../sql/SqlProducerOutputHeaderWithQueryTest.java | 1 +
.../sql/SqlProducerOutputTypeSelectListTest.java | 1 +
.../SqlProducerOutputTypeSelectListWithClassTest.java | 1 +
.../sql/SqlProducerOutputTypeSelectOneTest.java | 1 +
.../sql/SqlProducerOutputTypeStreamListTest.java | 1 +
.../component/sql/SqlProducerParametersCountTest.java | 1 +
.../component/sql/SqlProducerReuseParameterTest.java | 1 +
.../camel/component/sql/SqlProducerSeparatorTest.java | 1 +
.../camel/component/sql/SqlProducerToDTest.java | 1 +
.../sql/SqlProducerUseMessageBodyForSqlTest.java | 1 +
.../component/sql/SqlProducerWhereIssueTest.java | 1 +
.../org/apache/camel/component/sql/SqlRouteTest.java | 1 +
.../camel/component/sql/SqlTransactedRouteTest.java | 1 +
.../sql/stored/CallableStatementWrapperTest.java | 1 +
.../sql/stored/ProducerBatchInvalidTest.java | 1 +
.../camel/component/sql/stored/ProducerBatchTest.java | 1 +
.../component/sql/stored/ProducerBodyArrayTest.java | 1 +
.../camel/component/sql/stored/ProducerInOutTest.java | 1 +
.../camel/component/sql/stored/ProducerTest.java | 1 +
.../stored/ProducerUseMessageBodyForTemplateTest.java | 1 +
.../sql/stored/SqlFunctionDataSourceTest.java | 1 +
.../component/sql/stored/SqlStoredDataSourceTest.java | 1 +
.../camel/component/sql/stored/TemplateCacheTest.java | 1 +
.../jdbc/AbstractJdbcAggregationTestSupport.java | 4 ++--
.../aggregate/jdbc/JdbcAggregateStoreAsTextTest.java | 7 +++----
.../JdbcAggregationRepositoryMultipleRepoTest.java | 3 +--
...pringAggregateRecoverWithRedeliveryPolicyTest.java | 5 ++---
.../aggregate/jdbc/JdbcSpringAggregateTest.java | 4 ++--
.../camel/component/sql/SpringSqlEndpointLikeTest.xml | 4 ++--
.../camel/component/sql/SpringSqlMultilineTest.xml | 4 ++--
...SpringAggregateRecoverWithRedeliveryPolicyTest.xml | 2 --
.../aggregate/jdbc/JdbcSpringAggregateStoreAsText.xml | 2 --
.../aggregate/jdbc/JdbcSpringAggregateTest.xml | 2 --
.../processor/aggregate/jdbc/JdbcSpringDataSource.xml | 18 +++++++++---------
.../test/spring/junit5/CamelSpringTestSupport.java | 19 ++++++++++++++++---
71 files changed, 102 insertions(+), 40 deletions(-)
[camel] 01/02: Make camel-sql tests run in parallel
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ea2d17c9e864a9bed5c205fb32e1d98ad91663d9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 23 16:32:45 2021 +0100
Make camel-sql tests run in parallel
---
components/camel-sql/pom.xml | 4 ++++
.../component/sql/SpringSqlEndpointLikeTest.java | 3 +--
.../camel/component/sql/SpringSqlMultilineTest.java | 3 +--
.../sql/SqlConsumerDeleteBatchCompleteTest.java | 1 +
.../component/sql/SqlConsumerDeleteFailedTest.java | 1 +
.../camel/component/sql/SqlConsumerDeleteTest.java | 1 +
.../component/sql/SqlConsumerDeleteTransformTest.java | 1 +
.../sql/SqlConsumerDynamicParameterTest.java | 1 +
.../sql/SqlConsumerMaxMessagesPerPollTest.java | 1 +
.../sql/SqlConsumerOutputTypeSelectListTest.java | 1 +
.../SqlConsumerOutputTypeSelectListWithClassTest.java | 1 +
.../sql/SqlConsumerOutputTypeSelectOneTest.java | 1 +
.../sql/SqlConsumerOutputTypeStreamListTest.java | 1 +
.../apache/camel/component/sql/SqlConsumerTest.java | 1 +
.../camel/component/sql/SqlDataSourceRefTest.java | 1 +
.../apache/camel/component/sql/SqlDataSourceTest.java | 1 +
.../camel/component/sql/SqlEndpointLikeTest.java | 1 +
.../apache/camel/component/sql/SqlEndpointTest.java | 1 +
.../camel/component/sql/SqlPreserveHeaderTest.java | 1 +
.../SqlProducerAlwaysPopulateStatementFalseTest.java | 1 +
.../sql/SqlProducerAlwaysPopulateStatementTest.java | 1 +
.../camel/component/sql/SqlProducerAndInTest.java | 1 +
.../component/sql/SqlProducerConcurrentTest.java | 1 +
.../camel/component/sql/SqlProducerInMultiTest.java | 1 +
.../apache/camel/component/sql/SqlProducerInTest.java | 1 +
.../component/sql/SqlProducerInsertNullTest.java | 1 +
.../camel/component/sql/SqlProducerJSONTest.java | 1 +
.../sql/SqlProducerNamedParameterNotExistTest.java | 1 +
.../component/sql/SqlProducerNamedParameterTest.java | 1 +
.../component/sql/SqlProducerNamedParametersTest.java | 2 +-
.../camel/component/sql/SqlProducerNoopTest.java | 1 +
.../component/sql/SqlProducerNullBodyHeaderTest.java | 1 +
.../camel/component/sql/SqlProducerNullBodyTest.java | 1 +
.../component/sql/SqlProducerOutputHeaderTest.java | 1 +
.../sql/SqlProducerOutputHeaderWithQueryTest.java | 1 +
.../sql/SqlProducerOutputTypeSelectListTest.java | 1 +
.../SqlProducerOutputTypeSelectListWithClassTest.java | 1 +
.../sql/SqlProducerOutputTypeSelectOneTest.java | 1 +
.../sql/SqlProducerOutputTypeStreamListTest.java | 1 +
.../component/sql/SqlProducerParametersCountTest.java | 1 +
.../component/sql/SqlProducerReuseParameterTest.java | 1 +
.../camel/component/sql/SqlProducerSeparatorTest.java | 1 +
.../camel/component/sql/SqlProducerToDTest.java | 1 +
.../sql/SqlProducerUseMessageBodyForSqlTest.java | 1 +
.../component/sql/SqlProducerWhereIssueTest.java | 1 +
.../org/apache/camel/component/sql/SqlRouteTest.java | 1 +
.../camel/component/sql/SqlTransactedRouteTest.java | 1 +
.../sql/stored/CallableStatementWrapperTest.java | 1 +
.../sql/stored/ProducerBatchInvalidTest.java | 1 +
.../camel/component/sql/stored/ProducerBatchTest.java | 1 +
.../component/sql/stored/ProducerBodyArrayTest.java | 1 +
.../camel/component/sql/stored/ProducerInOutTest.java | 1 +
.../camel/component/sql/stored/ProducerTest.java | 1 +
.../stored/ProducerUseMessageBodyForTemplateTest.java | 1 +
.../sql/stored/SqlFunctionDataSourceTest.java | 1 +
.../component/sql/stored/SqlStoredDataSourceTest.java | 1 +
.../camel/component/sql/stored/TemplateCacheTest.java | 1 +
.../jdbc/AbstractJdbcAggregationTestSupport.java | 4 ++--
.../aggregate/jdbc/JdbcAggregateStoreAsTextTest.java | 7 +++----
.../JdbcAggregationRepositoryMultipleRepoTest.java | 3 +--
...pringAggregateRecoverWithRedeliveryPolicyTest.java | 5 ++---
.../aggregate/jdbc/JdbcSpringAggregateTest.java | 4 ++--
.../camel/component/sql/SpringSqlEndpointLikeTest.xml | 4 ++--
.../camel/component/sql/SpringSqlMultilineTest.xml | 4 ++--
...SpringAggregateRecoverWithRedeliveryPolicyTest.xml | 2 --
.../aggregate/jdbc/JdbcSpringAggregateStoreAsText.xml | 2 --
.../aggregate/jdbc/JdbcSpringAggregateTest.xml | 2 --
.../processor/aggregate/jdbc/JdbcSpringDataSource.xml | 18 +++++++++---------
.../test/spring/junit5/CamelSpringTestSupport.java | 19 ++++++++++++++++---
69 files changed, 99 insertions(+), 40 deletions(-)
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index 5b6799b..30d1aa5 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -31,6 +31,10 @@
<name>Camel :: SQL</name>
<description>Camel SQL support</description>
+ <properties>
+ <camel.surefire.parallel>true</camel.surefire.parallel>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java
index 7b47812..ab55ced 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java
@@ -20,13 +20,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringSqlEndpointLikeTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml");
+ return newAppContext("SpringSqlEndpointLikeTest.xml");
}
@Test
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java
index b75e2de..14f7dd5 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java
@@ -20,13 +20,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringSqlMultilineTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/sql/SpringSqlMultilineTest.xml");
+ return newAppContext("SpringSqlMultilineTest.xml");
}
@Test
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
index ad2cf4f..753ccee 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
@@ -41,6 +41,7 @@ public class SqlConsumerDeleteBatchCompleteTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
index 13ead0df..b97edba 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
@@ -46,6 +46,7 @@ public class SqlConsumerDeleteFailedTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
index cc497b4..78c9ec3 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
@@ -45,6 +45,7 @@ public class SqlConsumerDeleteTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
index ddf2e86..30c11a5 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
@@ -41,6 +41,7 @@ public class SqlConsumerDeleteTransformTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
index af3c13a..50a0f34 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
@@ -45,6 +45,7 @@ public class SqlConsumerDynamicParameterTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
index 8ad2568..b3bab1a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
@@ -40,6 +40,7 @@ public class SqlConsumerMaxMessagesPerPollTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY)
.addScript("sql/createAndPopulateDatabase4.sql")
.build();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
index 6a4c91c..7b2d24f 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
@@ -45,6 +45,7 @@ public class SqlConsumerOutputTypeSelectListTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
index bfaf795..402e4bd 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
@@ -44,6 +44,7 @@ public class SqlConsumerOutputTypeSelectListWithClassTest extends CamelTestSuppo
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
index 65c557f..71f88d4 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
@@ -44,6 +44,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
camel1 = new DefaultCamelContext();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
index f1c5b2d..e2bf376 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
@@ -40,6 +40,7 @@ public class SqlConsumerOutputTypeStreamListTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
index 6ca5bb4..0f2bec6 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
@@ -44,6 +44,7 @@ public class SqlConsumerTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
index 1741aa8..dbd6352 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
@@ -44,6 +44,7 @@ public class SqlDataSourceRefTest extends CamelTestSupport {
// START SNIPPET: e2
// this is the database we create with some initial data for our unit test
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
// END SNIPPET: e2
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
index 3471dff..18ac43b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
@@ -43,6 +43,7 @@ public class SqlDataSourceTest extends CamelTestSupport {
// this is the database we create with some initial data for our unit test
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
reg.bind("dataSource", db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
index f8c21af..9d09a19 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
@@ -46,6 +46,7 @@ public class SqlEndpointLikeTest extends CamelTestSupport {
Registry reg = new SimpleRegistry();
// this is the database we create with some initial data for our unit test
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
reg.bind("jdbc/myDataSource", db);
return reg;
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
index 5a57977..910f226 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
@@ -45,6 +45,7 @@ public class SqlEndpointTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
index efc3308..eee7cdb 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
@@ -45,6 +45,7 @@ public class SqlPreserveHeaderTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
index 92e4a59..981a14c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
@@ -49,6 +49,7 @@ public class SqlProducerAlwaysPopulateStatementFalseTest extends CamelTestSuppor
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
strategy = new DefaultSqlPrepareStatementStrategy() {
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
index 862e158..9705c2a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
@@ -48,6 +48,7 @@ public class SqlProducerAlwaysPopulateStatementTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
strategy = new DefaultSqlPrepareStatementStrategy() {
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
index 543e8cf..fe44576 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
@@ -40,6 +40,7 @@ public class SqlProducerAndInTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
index 9e13ce9..76a1eb0 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
@@ -93,6 +93,7 @@ public class SqlProducerConcurrentTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
index 41e054a..1438521 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
@@ -41,6 +41,7 @@ public class SqlProducerInMultiTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase6.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
index 4280a1e..d915528 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
@@ -40,6 +40,7 @@ public class SqlProducerInTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java
index 94efc43..121f394 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java
@@ -41,6 +41,7 @@ public class SqlProducerInsertNullTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase2.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java
index 3584544..a408b43 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java
@@ -40,6 +40,7 @@ public class SqlProducerJSONTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase2.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java
index 56a7c48..b37b671 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java
@@ -39,6 +39,7 @@ public class SqlProducerNamedParameterNotExistTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
index 26313b0..3278a8b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
@@ -41,6 +41,7 @@ public class SqlProducerNamedParameterTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java
index 1f4cd7f..d95dc09 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java
@@ -40,7 +40,7 @@ public class SqlProducerNamedParametersTest extends CamelTestSupport {
@Override
@BeforeEach
public void setUp() throws Exception {
- db = new EmbeddedDatabaseBuilder()
+ db = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY)
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
index 73e12eb..489efed 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
@@ -34,6 +34,7 @@ public class SqlProducerNoopTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
index 9baf6c4..9ce4898 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
@@ -40,6 +40,7 @@ public class SqlProducerNullBodyHeaderTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
index c4fe3ff..935b1eb 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
@@ -40,6 +40,7 @@ public class SqlProducerNullBodyTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java
index 75e8253..c03d61e 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java
@@ -34,6 +34,7 @@ public class SqlProducerOutputHeaderTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java
index 4509ed1..e06f100 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java
@@ -34,6 +34,7 @@ public class SqlProducerOutputHeaderWithQueryTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
index 487b1c2..ad050a0 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
@@ -40,6 +40,7 @@ public class SqlProducerOutputTypeSelectListTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java
index c38c08c..b62fa35 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java
@@ -39,6 +39,7 @@ public class SqlProducerOutputTypeSelectListWithClassTest extends CamelTestSuppo
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
index 10490d7..f08640f 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
@@ -42,6 +42,7 @@ public class SqlProducerOutputTypeSelectOneTest {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
camel1 = new DefaultCamelContext();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java
index 195eecf..e244068 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java
@@ -40,6 +40,7 @@ public class SqlProducerOutputTypeStreamListTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java
index e2857ee..a70305b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java
@@ -40,6 +40,7 @@ public class SqlProducerParametersCountTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java
index 21330b9..19f0b91 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java
@@ -40,6 +40,7 @@ public class SqlProducerReuseParameterTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java
index 70935d6..bf34e6a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java
@@ -38,6 +38,7 @@ public class SqlProducerSeparatorTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
index e5f6757..547dd5c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
@@ -41,6 +41,7 @@ public class SqlProducerToDTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java
index 9b41811..11d27a0 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java
@@ -42,6 +42,7 @@ public class SqlProducerUseMessageBodyForSqlTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
index 9eac7e4..51942a9 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
@@ -39,6 +39,7 @@ public class SqlProducerWhereIssueTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
index 10196a9..8669d05 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
@@ -256,6 +256,7 @@ public class SqlRouteTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
index 0186996..b96b60c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
@@ -60,6 +60,7 @@ public class SqlTransactedRouteTest extends CamelTestSupport {
Registry reg = new SimpleRegistry();
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).build();
reg.bind("testdb", db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
index c2a5e81..009a670 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
@@ -45,6 +45,7 @@ public class CallableStatementWrapperTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
jdbcTemplate = new JdbcTemplate(db);
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java
index eb10431..27096fb 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java
@@ -41,6 +41,7 @@ public class ProducerBatchInvalidTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java
index d738b95..e10a11e 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java
@@ -43,6 +43,7 @@ public class ProducerBatchTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
index 92ca1b1..bba2d89 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java
@@ -40,6 +40,7 @@ public class ProducerBodyArrayTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java
index 5d3b9c2..8454c84 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java
@@ -41,6 +41,7 @@ public class ProducerInOutTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java
index 48f52dc..d0fe18b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java
@@ -41,6 +41,7 @@ public class ProducerTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java
index 94ef611..95f5f40 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java
@@ -40,6 +40,7 @@ public class ProducerUseMessageBodyForTemplateTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java
index b4e124a..4eaff6d 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java
@@ -40,6 +40,7 @@ public class SqlFunctionDataSourceTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java
index 07d4b78..0088e33 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java
@@ -41,6 +41,7 @@ public class SqlStoredDataSourceTest extends CamelTestSupport {
// START SNIPPET: e2
// this is the database we create with some initial data for our unit test
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
// END SNIPPET: e2
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java
index 3e381a9..8d7f0e3 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java
@@ -36,6 +36,7 @@ public class TemplateCacheTest extends CamelTestSupport {
@BeforeEach
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
super.setUp();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractJdbcAggregationTestSupport.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractJdbcAggregationTestSupport.java
index 570d7aa..c82a883 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractJdbcAggregationTestSupport.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractJdbcAggregationTestSupport.java
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public abstract class AbstractJdbcAggregationTestSupport extends CamelSpringTestSupport {
@@ -61,7 +60,8 @@ public abstract class AbstractJdbcAggregationTestSupport extends CamelSpringTest
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml");
+ return newAppContext(
+ "JdbcSpringDataSource.xml", "JdbcSpringDataSource.xml");
}
protected Exchange repoAddAndGet(String key, Exchange exchange) {
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java
index 747b3f2..c89f466 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.jdbc.core.JdbcTemplate;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -42,8 +41,8 @@ public class JdbcAggregateStoreAsTextTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(
- "org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateStoreAsText.xml");
+ return newAppContext(
+ "JdbcSpringDataSource.xml", "JdbcSpringAggregateStoreAsText.xml");
}
@Override
@@ -51,7 +50,7 @@ public class JdbcAggregateStoreAsTextTest extends CamelSpringTestSupport {
super.postProcessTest();
repo = applicationContext.getBean("repo3", JdbcAggregationRepository.class);
- dataSource = context.getRegistry().lookupByNameAndType("dataSource3", DataSource.class);
+ dataSource = context.getRegistry().lookupByNameAndType(getClass().getSimpleName() + "-dataSource3", DataSource.class);
jdbcTemplate = new JdbcTemplate(dataSource);
jdbcTemplate.afterPropertiesSet();
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java
index 2152623..8f6ba5c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -104,7 +103,7 @@ public class JdbcAggregationRepositoryMultipleRepoTest extends CamelSpringTestSu
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml");
+ return newAppContext("JdbcSpringDataSource.xml");
}
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java
index 0deab84..d32add7 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Processor;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JdbcSpringAggregateRecoverWithRedeliveryPolicyTest extends CamelSpringTestSupport {
@@ -32,8 +31,8 @@ public class JdbcSpringAggregateRecoverWithRedeliveryPolicyTest extends CamelSpr
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(
- "org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml");
+ return newAppContext(
+ "JdbcSpringDataSource.xml", "JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml");
}
@Test
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java
index 9c939e3..68c2e1e 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java
@@ -22,13 +22,13 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JdbcSpringAggregateTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml");
+ return newAppContext(
+ "JdbcSpringDataSource.xml", "JdbcSpringAggregateTest.xml");
}
@Test
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
index 6ed3464..07fef26 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
@@ -25,14 +25,14 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- In Memory Database -->
- <jdbc:embedded-database id="myDataSource" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}" type="DERBY">
<jdbc:script location="classpath:/sql/createAndPopulateDatabase.sql"/>
</jdbc:embedded-database>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <to uri="sql:select * from projects where license like 'A%25'?dataSource=#myDataSource"/>
+ <to uri="sql:select * from projects where license like 'A%25'?dataSource=#{{testClassSimpleName}}"/>
<split>
<simple>${body}</simple>
<to uri="mock:result"/>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
index cf903b4..dc28242 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- In Memory Database -->
- <jdbc:embedded-database id="myDataSource" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}" type="DERBY">
<jdbc:script location="classpath:/sql/createAndPopulateDatabase.sql"/>
</jdbc:embedded-database>
@@ -34,7 +34,7 @@
<from uri="direct:start"/>
<!-- need to use %20 on each line when we break up the SQL into new lines -->
<to uri="sql:select * from projects
- %20where license like 'A%25'?dataSource=#myDataSource"/>
+ %20where license like 'A%25'?dataSource=#{{testClassSimpleName}}"/>
<split>
<simple>${body}</simple>
<to uri="mock:result"/>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml
index 6207fb4..42ac0ef 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml
@@ -29,8 +29,6 @@
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <import resource="JdbcSpringDataSource.xml" />
-
<bean id="repoQuickRecovery" parent="repo1">
<!-- scan 2 times per second -->
<property name="recoveryInterval" value="500"/>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateStoreAsText.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateStoreAsText.xml
index e438a5d..651a5cb 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateStoreAsText.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateStoreAsText.xml
@@ -23,8 +23,6 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <import resource="JdbcSpringDataSource.xml" />
-
<!-- aggregate the messages using this strategy -->
<bean id="myAggregatorStrategy" class="org.apache.camel.processor.aggregate.jdbc.AbstractJdbcAggregationTestSupport$MyAggregationStrategy"/>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml
index f2144a3..43e4a16 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml
@@ -29,8 +29,6 @@
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <import resource="JdbcSpringDataSource.xml" />
-
<!-- aggregate the messages using this strategy -->
<bean id="myAggregatorStrategy" class="org.apache.camel.processor.aggregate.jdbc.AbstractJdbcAggregationTestSupport$MyAggregationStrategy"/>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
index 740b308..b7ce498 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
@@ -37,37 +37,37 @@
<tx:annotation-driven transaction-manager="txManager"/>
<!-- In Memory Database #1 -->
- <jdbc:embedded-database id="dataSource1" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource1" type="DERBY">
<jdbc:script location="classpath:/sql/init.sql"/>
</jdbc:embedded-database>
<!-- In Memory Database #2 -->
- <jdbc:embedded-database id="dataSource2" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource2" type="DERBY">
<jdbc:script location="classpath:/sql/init2.sql"/>
</jdbc:embedded-database>
<!-- In Memory Database #3 -->
- <jdbc:embedded-database id="dataSource3" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource3" type="DERBY">
<jdbc:script location="classpath:/sql/init3.sql"/>
</jdbc:embedded-database>
<bean id="repo1" class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
<property name="repositoryName" value="aggregationRepo1" />
<property name="transactionManager" ref="txManager1" />
- <property name="dataSource" ref="dataSource1" />
+ <property name="dataSource" ref="{{testClassSimpleName}}-dataSource1" />
</bean>
<bean id="repo2" class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
<property name="repositoryName" value="aggregationRepo2" />
<property name="transactionManager" ref="txManager2" />
- <property name="dataSource" ref="dataSource2" />
+ <property name="dataSource" ref="{{testClassSimpleName}}-dataSource2" />
</bean>
<!-- START SNIPPET: e3 -->
<bean id="repo3" class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
<property name="repositoryName" value="aggregationRepo3"/>
<property name="transactionManager" ref="txManager3"/>
- <property name="dataSource" ref="dataSource3"/>
+ <property name="dataSource" ref="{{testClassSimpleName}}-dataSource3"/>
<!-- configure to store the message body and following headers as text in the repo -->
<property name="storeBodyAsText" value="true"/>
<property name="headersToStoreAsText">
@@ -80,15 +80,15 @@
<!-- END SNIPPET: e3 -->
<bean id="txManager1" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="dataSource1"/>
+ <property name="dataSource" ref="{{testClassSimpleName}}-dataSource1"/>
</bean>
<bean id="txManager2" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="dataSource2"/>
+ <property name="dataSource" ref="{{testClassSimpleName}}-dataSource2"/>
</bean>
<bean id="txManager3" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource" ref="dataSource3"/>
+ <property name="dataSource" ref="{{testClassSimpleName}}-dataSource3"/>
</bean>
</beans>
diff --git a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java
index be6d235..110fc97 100644
--- a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java
+++ b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.DefaultPropertiesParser;
@@ -245,6 +246,10 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
return newAppContext(configLocation, getClass(), getTranslationProperties());
}
+ public AbstractXmlApplicationContext newAppContext(String... configLocations) throws BeansException {
+ return newAppContext(configLocations, getClass(), getTranslationProperties());
+ }
+
protected Map<String, String> getTranslationProperties() {
return getTranslationProperties(getClass());
}
@@ -266,14 +271,22 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
return new MyXmlApplicationContext(configLocation, clazz, props);
}
+ public static MyXmlApplicationContext newAppContext(String[] configLocations, Class<?> clazz, Map<String, String> props) {
+ return new MyXmlApplicationContext(configLocations, clazz, props);
+ }
+
public static class MyXmlApplicationContext extends AbstractXmlApplicationContext {
private final Resource[] configResources;
public MyXmlApplicationContext(String configLocation, Class<?> clazz, Map<String, String> properties) {
+ this(new String[] { configLocation }, clazz, properties);
+ }
+
+ public MyXmlApplicationContext(String[] configLocations, Class<?> clazz, Map<String, String> properties) {
super(null);
- configResources = new Resource[] {
- new TranslatedResource(new ClassPathResource(configLocation, clazz), properties)
- };
+ configResources = Stream.of(configLocations)
+ .map(loc -> new TranslatedResource(new ClassPathResource(loc, clazz), properties))
+ .toArray(Resource[]::new);
refresh();
}
[camel] 02/02: Make camel-jdbc tests run in parallel
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ca31a03bc97c15fb78bd404ecafd1f6243c2029a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 23 16:33:53 2021 +0100
Make camel-jdbc tests run in parallel
---
components/camel-jdbc/pom.xml | 2 ++
.../java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java | 1 +
2 files changed, 3 insertions(+)
diff --git a/components/camel-jdbc/pom.xml b/components/camel-jdbc/pom.xml
index 0c0cdc7..1b6d2c0 100644
--- a/components/camel-jdbc/pom.xml
+++ b/components/camel-jdbc/pom.xml
@@ -35,6 +35,8 @@
<properties>
<firstVersion>1.2.0</firstVersion>
<label>database</label>
+
+ <camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
<dependencies>
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java
index 6e640e3..358a8dc 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java
@@ -36,6 +36,7 @@ public abstract class AbstractJdbcTestSupport extends CamelTestSupport {
@Override
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/init.sql").build();
super.setUp();