This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 300b03cd5f6 CAMEL-20785: avoid using setup/cleanup deprecated methods
300b03cd5f6 is described below
commit 300b03cd5f66b1fe4f15440db01453a7c2ad541d
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Tue Jun 4 14:30:06 2024 +0200
CAMEL-20785: avoid using setup/cleanup deprecated methods
---
.../camel/component/aws/xray/CamelAwsXRayTestSupport.java | 11 ++++-------
.../apache/camel/component/kamelet/KameletRouteDumpTest.java | 8 ++++----
.../jdbc/AbstractClusteredJdbcAggregationTestSupport.java | 12 +-----------
.../aggregate/jdbc/AbstractJdbcAggregationTestSupport.java | 11 +++--------
.../aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java | 5 +++++
.../aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java | 2 ++
.../jdbc/JdbcAggregateForceCompletionHeaderTest.java | 2 ++
.../aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java | 2 ++
.../aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java | 2 ++
.../processor/aggregate/jdbc/JdbcAggregateLoadTest.java | 2 ++
.../jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java | 2 ++
.../processor/aggregate/jdbc/JdbcAggregateNotLostTest.java | 2 ++
.../JdbcAggregateRecoverDeadLetterChannelFailedTest.java | 3 +++
.../jdbc/JdbcAggregateRecoverDeadLetterChannelTest.java | 4 ++++
.../processor/aggregate/jdbc/JdbcAggregateRecoverTest.java | 4 ++++
.../jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java | 4 ++++
.../aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java | 4 ++++
.../aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java | 2 ++
.../aggregate/jdbc/JdbcAggregateStoreAsText2Test.java | 7 +++----
.../aggregate/jdbc/JdbcAggregateStoreAsTextTest.java | 7 +++----
.../camel/processor/aggregate/jdbc/JdbcAggregateTest.java | 2 ++
.../jdbc/JdbcAggregateTimeoutCompletionRestartTest.java | 2 ++
.../jdbc/JdbcAggregationRepositoryRecoverExistingTest.java | 4 ++++
.../aggregate/jdbc/JdbcAggregationRepositoryTest.java | 2 ++
.../aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java | 2 ++
.../apache/camel/test/main/junit5/CamelMainTestSupport.java | 7 +------
.../camel/test/main/junit5/legacy/ReplaceBeanTest.java | 7 +++++++
.../test/main/junit5/legacy/ReplaceBeanWithMockTest.java | 7 +++++++
28 files changed, 85 insertions(+), 44 deletions(-)
diff --git
a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
index 66e60d8d3b4..dfe1bcba4d3 100644
---
a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
+++
b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
@@ -44,20 +44,17 @@ public class CamelAwsXRayTestSupport extends
CamelTestSupport {
}
@BeforeEach
- public void setUp() throws Exception {
+ public void setUpSocket() {
socketListener.before();
- super.setUp();
}
@AfterEach
- public void tearDown() throws Exception {
- super.tearDown();
+ public void cleanupSocket() {
socketListener.after();
}
- @Override
- protected void postProcessTest() throws Exception {
- super.postProcessTest();
+ @AfterEach
+ protected void cleanupData() {
socketListener.getReceivedData().clear();
}
diff --git
a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteDumpTest.java
b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteDumpTest.java
index 27822b7cfcd..a3c84888386 100644
---
a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteDumpTest.java
+++
b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteDumpTest.java
@@ -21,16 +21,16 @@ import java.util.UUID;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
public class KameletRouteDumpTest extends CamelTestSupport {
- @Override
- protected void postProcessTest() throws Exception {
- context().setDumpRoutes("xml");
- super.postProcessTest();
+ @AfterEach
+ protected void setupDumpRouters() {
+ context.setDumpRoutes("xml");
}
@Test
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractClusteredJdbcAggregationTestSupport.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractClusteredJdbcAggregationTestSupport.java
index 01f2b7a1e14..7d5c3059fd7 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractClusteredJdbcAggregationTestSupport.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/AbstractClusteredJdbcAggregationTestSupport.java
@@ -26,17 +26,7 @@ public abstract class
AbstractClusteredJdbcAggregationTestSupport extends CamelS
ClusteredJdbcAggregationRepository repo;
ClusteredJdbcAggregationRepository repobis;
- @Override
- public void postProcessTest() throws Exception {
- super.postProcessTest();
-
- repo = applicationContext.getBean("repo5",
ClusteredJdbcAggregationRepository.class);
- repobis = applicationContext.getBean("repo6",
ClusteredJdbcAggregationRepository.class);
- configureJdbcAggregationRepository();
- }
-
- void configureJdbcAggregationRepository() {
- }
+ abstract void configureJdbcAggregationRepository();
@Override
protected AbstractApplicationContext createApplicationContext() {
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 d30bdda85de..a4d44df788b 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
@@ -28,15 +28,8 @@ public abstract class AbstractJdbcAggregationTestSupport
extends CamelSpringTest
JdbcAggregationRepository repo;
- @Override
- public void postProcessTest() throws Exception {
- super.postProcessTest();
-
- repo = applicationContext.getBean("repo1",
JdbcAggregationRepository.class);
- configureJdbcAggregationRepository();
- }
-
void configureJdbcAggregationRepository() {
+ repo = applicationContext.getBean("repo1",
JdbcAggregationRepository.class);
}
@Override
@@ -45,6 +38,8 @@ public abstract class AbstractJdbcAggregationTestSupport
extends CamelSpringTest
@Override
// START SNIPPET: e1
public void configure() {
+ configureJdbcAggregationRepository();
+
// here is the Camel route where we aggregate
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java
index 1bf5bb3456d..2f89fc12197 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java
@@ -31,6 +31,9 @@ public class ClusteredJdbcAggregateRecoverTest extends
AbstractClusteredJdbcAggr
@Override
void configureJdbcAggregationRepository() {
+ repo = applicationContext.getBean("repo5",
ClusteredJdbcAggregationRepository.class);
+ repobis = applicationContext.getBean("repo6",
ClusteredJdbcAggregationRepository.class);
+
// enable recovery
repo.setUseRecovery(true);
// check faster
@@ -68,6 +71,8 @@ public class ClusteredJdbcAggregateRecoverTest extends
AbstractClusteredJdbcAggr
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start").aggregate(header("id"), new
MyAggregationStrategy()).completionSize(5)
.aggregationRepository(repo)
.log("aggregated exchange id ${exchangeId} with
${body}").to("mock:aggregated").delay(1000)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
index 6e0b4481a80..c5784da56cc 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
@@ -54,6 +54,8 @@ public class JdbcAggregateDiscardOnTimeoutTest extends
AbstractJdbcAggregationTe
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(3).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateForceCompletionHeaderTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateForceCompletionHeaderTest.java
index 3de7d17172b..4c9c915ffda 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateForceCompletionHeaderTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateForceCompletionHeaderTest.java
@@ -81,6 +81,8 @@ public class JdbcAggregateForceCompletionHeaderTest extends
AbstractJdbcAggregat
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
// here is the Camel route where we aggregate
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
index d3aa8f02d50..58bdd574432 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
@@ -75,6 +75,8 @@ public class JdbcAggregateLoadAndRecoverTest extends
AbstractJdbcAggregationTest
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
onException(IllegalStateException.class)
.maximumRedeliveries(3)
.redeliveryDelay(100L);
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
index 997604dc0c8..1fcfc0eb017 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
@@ -68,6 +68,8 @@ public class JdbcAggregateLoadConcurrentTest extends
AbstractJdbcAggregationTest
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.to("log:input?groupSize=500")
.aggregate(header("id"), new MyAggregationStrategy())
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
index 62b3c6e342c..f617548009b 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
@@ -52,6 +52,8 @@ public class JdbcAggregateLoadTest extends
AbstractJdbcAggregationTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("seda:start?size=" + SIZE)
.to("log:input?groupSize=500")
.aggregate(header("id"), new MyAggregationStrategy())
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
index 3173ccdb2e3..802c844339e 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
@@ -53,6 +53,8 @@ public class JdbcAggregateNotLostRemovedWhenConfirmedTest
extends AbstractJdbcAg
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(5).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
index 4a63689f741..b4dda2b1a64 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
@@ -62,6 +62,8 @@ public class JdbcAggregateNotLostTest extends
AbstractJdbcAggregationTestSupport
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(5).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java
index 264fb0aad65..8849b1fa3f4 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java
@@ -28,6 +28,7 @@ public class JdbcAggregateRecoverDeadLetterChannelFailedTest
extends AbstractJdb
@Override
void configureJdbcAggregationRepository() {
+ super.configureJdbcAggregationRepository();
// enable recovery
repo.setUseRecovery(true);
// exhaust after at most 3 attempts
@@ -61,6 +62,8 @@ public class JdbcAggregateRecoverDeadLetterChannelFailedTest
extends AbstractJdb
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start").routeId("start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(5).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelTest.java
index 5b8c743858b..4a85c066ba5 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelTest.java
@@ -27,6 +27,8 @@ public class JdbcAggregateRecoverDeadLetterChannelTest
extends AbstractJdbcAggre
@Override
void configureJdbcAggregationRepository() {
+ super.configureJdbcAggregationRepository();
+
// enable recovery
repo.setUseRecovery(true);
// exhaust after at most 3 attempts
@@ -60,6 +62,8 @@ public class JdbcAggregateRecoverDeadLetterChannelTest
extends AbstractJdbcAggre
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(5).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java
index 1a4f9f463c8..a155296aa19 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java
@@ -31,6 +31,8 @@ public class JdbcAggregateRecoverTest extends
AbstractJdbcAggregationTestSupport
@Override
void configureJdbcAggregationRepository() {
+ super.configureJdbcAggregationRepository();
+
// enable recovery
repo.setUseRecovery(true);
// check faster
@@ -61,6 +63,8 @@ public class JdbcAggregateRecoverTest extends
AbstractJdbcAggregationTestSupport
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(5).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java
index e26719f091b..a2907d379d3 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java
@@ -31,6 +31,8 @@ public class JdbcAggregateRecoverWithRedeliveryPolicyTest
extends AbstractJdbcAg
@Override
void configureJdbcAggregationRepository() {
+ super.configureJdbcAggregationRepository();
+
// enable recovery
repo.setUseRecovery(true);
// check faster
@@ -64,6 +66,8 @@ public class JdbcAggregateRecoverWithRedeliveryPolicyTest
extends AbstractJdbcAg
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(5).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java
index 93e5160e363..e8b0e4bbfd2 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java
@@ -31,6 +31,8 @@ public class JdbcAggregateRecoverWithSedaTest extends
AbstractJdbcAggregationTes
@Override
void configureJdbcAggregationRepository() {
+ super.configureJdbcAggregationRepository();
+
// enable recovery
repo.setUseRecovery(true);
// check faster
@@ -61,6 +63,8 @@ public class JdbcAggregateRecoverWithSedaTest extends
AbstractJdbcAggregationTes
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(5).aggregationRepository(repo)
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java
index ae412cf4b56..658b4bbc19e 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java
@@ -53,6 +53,8 @@ public class JdbcAggregateSerializedHeadersTest extends
AbstractJdbcAggregationT
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
repo.setAllowSerializedHeaders(true);
from("seda:start?size=" + SIZE)
.to("log:input?groupSize=500")
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText2Test.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText2Test.java
index 9d8c4ecdd8e..f06552e9f99 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText2Test.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText2Test.java
@@ -24,6 +24,7 @@ import javax.sql.DataSource;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -46,10 +47,8 @@ public class JdbcAggregateStoreAsText2Test extends
CamelSpringTestSupport {
"JdbcSpringDataSource.xml",
"JdbcSpringAggregateStoreAsText2.xml");
}
- @Override
- public void postProcessTest() throws Exception {
- super.postProcessTest();
-
+ @BeforeEach
+ public void configureJdbcAggregationRepository() throws Exception {
repo = applicationContext.getBean("repo4",
JdbcAggregationRepository.class);
dataSource =
context.getRegistry().lookupByNameAndType(getClass().getSimpleName() +
"-dataSource4", DataSource.class);
jdbcTemplate = new JdbcTemplate(dataSource);
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 d2e6c71d638..6451048219c 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
@@ -25,6 +25,7 @@ import javax.sql.DataSource;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -47,10 +48,8 @@ public class JdbcAggregateStoreAsTextTest extends
CamelSpringTestSupport {
"JdbcSpringDataSource.xml",
"JdbcSpringAggregateStoreAsText.xml");
}
- @Override
- public void postProcessTest() throws Exception {
- super.postProcessTest();
-
+ @BeforeEach
+ public void configureJdbcAggregationRepository() throws Exception {
repo = applicationContext.getBean("repo3",
JdbcAggregationRepository.class);
dataSource =
context.getRegistry().lookupByNameAndType(getClass().getSimpleName() +
"-dataSource3", DataSource.class);
jdbcTemplate = new JdbcTemplate(dataSource);
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java
index f20cad1b34c..aa490881e16 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java
@@ -48,6 +48,8 @@ public class JdbcAggregateTest extends
AbstractJdbcAggregationTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
// here is the Camel route where we aggregate
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTimeoutCompletionRestartTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTimeoutCompletionRestartTest.java
index db597058db9..0631c36fc74 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTimeoutCompletionRestartTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTimeoutCompletionRestartTest.java
@@ -52,6 +52,8 @@ public class JdbcAggregateTimeoutCompletionRestartTest
extends AbstractJdbcAggre
return new RouteBuilder() {
@Override
public void configure() {
+ configureJdbcAggregationRepository();
+
// here is the Camel route where we aggregate
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryRecoverExistingTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryRecoverExistingTest.java
index cbac26ff40f..39207897a73 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryRecoverExistingTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryRecoverExistingTest.java
@@ -29,6 +29,8 @@ public class JdbcAggregationRepositoryRecoverExistingTest
extends AbstractJdbcAg
@Override
void configureJdbcAggregationRepository() {
+ super.configureJdbcAggregationRepository();
+
repo.setReturnOldExchange(true);
repo.setUseRecovery(true);
}
@@ -37,6 +39,8 @@ public class JdbcAggregationRepositoryRecoverExistingTest
extends AbstractJdbcAg
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
+ configureJdbcAggregationRepository();
+
// no routes added by default
}
};
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java
index 6291f522dc1..2dfb20aaf22 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java
@@ -27,6 +27,8 @@ public class JdbcAggregationRepositoryTest extends
AbstractJdbcAggregationTestSu
@Override
void configureJdbcAggregationRepository() {
+ super.configureJdbcAggregationRepository();
+
repo.setReturnOldExchange(true);
}
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
index 16c4dd7bd87..e3cca38a39e 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
@@ -122,6 +122,8 @@ public class JdbcRemoveConfirmOrderAggregateTest extends
AbstractJdbcAggregation
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ configureJdbcAggregationRepository();
+
from("direct:start").
threads(2).
transacted("required").aggregate(header("id"), new
MyAggregationStrategyWithDelay()).completionSize(2).aggregationRepository(repo)
diff --git
a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainTestSupport.java
b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainTestSupport.java
index a6d55a84f9a..7884bedbaec 100644
---
a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainTestSupport.java
+++
b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainTestSupport.java
@@ -74,6 +74,7 @@ public abstract class CamelMainTestSupport extends
CamelTestSupport {
* @param registry the registry in which the custom beans are bound.
* @throws Exception if an error occurs while binding a custom bean.
*/
+ @Deprecated
protected void bindToRegistryAfterInjections(Registry registry) throws
Exception {
// Nothing to do by default
}
@@ -147,12 +148,6 @@ public abstract class CamelMainTestSupport extends
CamelTestSupport {
return context;
}
- @Override
- protected void postProcessTest() throws Exception {
- super.postProcessTest();
- bindToRegistryAfterInjections(context.getRegistry());
- }
-
/**
* @return {@code null} if {@link #getPropertyPlaceholderFileName()}
returns {@code null}, otherwise it generates a
* list of locations assuming that the file is either in the
package of the test class or directly in the
diff --git
a/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanTest.java
b/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanTest.java
index e7338c6507f..95edbe9fb47 100644
---
a/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanTest.java
+++
b/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanTest.java
@@ -35,6 +35,13 @@ class ReplaceBeanTest extends CamelMainTestSupport {
@PropertyInject("name")
String name;
+ @Override
+ protected void postProcessTest() throws Exception {
+ super.postProcessTest();
+
+ bindToRegistryAfterInjections(context.getRegistry());
+ }
+
@Override
protected void configure(MainConfigurationProperties configuration) {
// Add the configuration class
diff --git
a/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanWithMockTest.java
b/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanWithMockTest.java
index 690ab6363c2..c0adeb4d17a 100644
---
a/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanWithMockTest.java
+++
b/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/ReplaceBeanWithMockTest.java
@@ -45,6 +45,13 @@ class ReplaceBeanWithMockTest extends CamelMainTestSupport {
configuration.addConfiguration(MyConfiguration.class);
}
+ @Override
+ protected void postProcessTest() throws Exception {
+ super.postProcessTest();
+
+ bindToRegistryAfterInjections(context.getRegistry());
+ }
+
@Override
protected void bindToRegistryAfterInjections(Registry registry) throws
Exception {
when(greetings.sayHello()).thenReturn("Hola Will!");
