diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java index 354747db4dfa2..c2e8461171c1f 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java @@ -23,6 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; public class HibernateValidationProviderResolverTest extends CamelTestSupport { @@ -58,7 +59,7 @@ void shouldResolveHibernateValidationProviderResolver() throws InterruptedExcept CarWithAnnotations carWithNullFields = new CarWithAnnotations(null, null); // When - sendBody("direct:test", carWithNullFields); + TestSupport.sendBody(template, "direct:test", carWithNullFields); // Then MockEndpoint.assertIsSatisfied(context); diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java index 16f0c450bb116..b6364e39402f8 100644 --- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java +++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java @@ -30,6 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; @@ -91,7 +92,7 @@ void testECDSASHA1() throws Exception { assumeFalse(!canRun, "Test preconditions failed: canRun=" + canRun); setupMock(); - sendBody("direct:ecdsa-sha1", payload); + TestSupport.sendBody(template, "direct:ecdsa-sha1", payload); MockEndpoint.assertIsSatisfied(context); } diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java index 6e65c549219b7..3b148b572ca79 100644 --- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java +++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java @@ -38,6 +38,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @@ -195,7 +196,7 @@ public void configure() { @Test void testBasicSignatureRoute() throws Exception { setupMock(); - sendBody("direct:keypair", payload); + TestSupport.sendBody(template, "direct:keypair", payload); MockEndpoint.assertIsSatisfied(context); MockEndpoint mock = getMockEndpoint("mock:result"); @@ -207,35 +208,35 @@ void testBasicSignatureRoute() throws Exception { @Test void testSetAlgorithmInRouteDefinition() throws Exception { setupMock(); - sendBody("direct:algorithm", payload); + TestSupport.sendBody(template, "direct:algorithm", payload); MockEndpoint.assertIsSatisfied(context); } @Test void testRSASHA1() throws Exception { setupMock(); - sendBody("direct:rsa-sha1", payload); + TestSupport.sendBody(template, "direct:rsa-sha1", payload); MockEndpoint.assertIsSatisfied(context); } @Test void testRSASHA256() throws Exception { setupMock(); - sendBody("direct:rsa-sha256", payload); + TestSupport.sendBody(template, "direct:rsa-sha256", payload); MockEndpoint.assertIsSatisfied(context); } @Test void testSetBufferInRouteDefinition() throws Exception { setupMock(); - sendBody("direct:buffersize", payload); + TestSupport.sendBody(template, "direct:buffersize", payload); MockEndpoint.assertIsSatisfied(context); } @Test void testSetRandomInRouteDefinition() throws Exception { setupMock(); - sendBody("direct:random", payload); + TestSupport.sendBody(template, "direct:random", payload); MockEndpoint.assertIsSatisfied(context); } @@ -243,28 +244,28 @@ void testSetRandomInRouteDefinition() throws Exception { @Test void testSetProviderInRouteDefinition() throws Exception { setupMock(); - sendBody("direct:provider", payload); + TestSupport.sendBody(template, "direct:provider", payload); MockEndpoint.assertIsSatisfied(context); } @Test void testSetCertificateInRouteDefinition() throws Exception { setupMock(); - sendBody("direct:certificate", payload); + TestSupport.sendBody(template, "direct:certificate", payload); MockEndpoint.assertIsSatisfied(context); } @Test void testSetKeystoreInRouteDefinition() throws Exception { setupMock(); - sendBody("direct:keystore", payload); + TestSupport.sendBody(template, "direct:keystore", payload); MockEndpoint.assertIsSatisfied(context); } @Test void testSetKeystoreParametersInRouteDefinition() throws Exception { setupMock(); - sendBody("direct:keystoreParameters", payload); + TestSupport.sendBody(template, "direct:keystoreParameters", payload); MockEndpoint.assertIsSatisfied(context); } diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java index b8945bcf653a5..abcce8ebce6a6 100644 --- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java +++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java @@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod; import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; @@ -79,7 +80,7 @@ public void testDelete() { String fileId = testFile.getId(); // using String message body for single parameter "fileId" - sendBody("direct://DELETE", fileId); + TestSupport.sendBody(template, "direct://DELETE", fileId); try { // the file should be gone now diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java index 9717f131cc3fc..1378aa28dd461 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java @@ -24,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; /** @@ -41,7 +42,7 @@ public void testSendMatchingMessage() throws Exception { cells.put("foo", "bar"); grid.add(cells); - sendBody("direct:start", grid); + TestSupport.sendBody(template, "direct:start", grid); MockEndpoint.assertIsSatisfied(context); } diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java index 7afd1fd06a2c3..6d7e19e5fa97a 100644 --- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java +++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java @@ -22,6 +22,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.influxdb.dto.Point; import org.influxdb.dto.Query; import org.influxdb.dto.QueryResult; @@ -76,7 +77,7 @@ public void testWithExistingDB() throws InterruptedException { Mockito.when(mockedDbConnection.query(Mockito.any(Query.class))).thenReturn(queryResult); - sendBody("direct:test", createPoint()); + TestSupport.sendBody(template, "direct:test", createPoint()); //if db exist, there will be only 1 call to show databases. Mockito.verify(mockedDbConnection, Mockito.times(2)).query(Mockito.any(Query.class)); @@ -94,7 +95,7 @@ public void testWithNonExistingDB() throws InterruptedException { QueryResult queryResult = new QueryResult(); queryResult.setResults(Collections.singletonList(new QueryResult.Result())); - sendBody("direct:test", createPoint()); + TestSupport.sendBody(template, "direct:test", createPoint()); //if db does not exist, there will be 2 queries (show databases and create database) Mockito.verify(mockedDbConnection, Mockito.times(2)).query(Mockito.any(Query.class)); diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java index b94fd0e8dea2c..26538c6dff27c 100644 --- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java +++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java @@ -21,6 +21,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.influxdb.dto.BatchPoints; import org.influxdb.dto.Point; import org.junit.jupiter.api.BeforeEach; @@ -62,7 +63,7 @@ public void writeBatchPoints() throws InterruptedException { successEndpoint.expectedMessageCount(1); BatchPoints batchPoints = createBatchPoints(); - sendBody("direct:test", batchPoints); + TestSupport.sendBody(template, "direct:test", batchPoints); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java index 2659529f02898..1297d59005bd1 100644 --- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java +++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java @@ -22,6 +22,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -53,7 +54,7 @@ public void writePointFromMapAndStaticDbName() throws InterruptedException { successEndpoint.expectedMessageCount(1); - sendBody("direct:test", "test"); + TestSupport.sendBody(template, "direct:test", "test"); successEndpoint.assertIsSatisfied(); } diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java index 1d0e562a3f0e8..f389cf6986667 100644 --- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java +++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java @@ -24,6 +24,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -71,7 +72,7 @@ public void writePointFromMapAndStaticDbName() throws InterruptedException { successEndpoint.expectedMessageCount(1); Map pointMap = createMapPoint(); - sendBody("direct:test", pointMap); + TestSupport.sendBody(template, "direct:test", pointMap); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java index 2edcbb64f85c7..1cb24bfa03f8c 100644 --- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java +++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java @@ -22,6 +22,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -61,7 +62,7 @@ public void writePointFromMapAndStaticDbName() throws InterruptedException { successEndpoint.expectedMessageCount(1); Map pointMap = createMapPoint(); - sendBody("direct:test", pointMap); + TestSupport.sendBody(template, "direct:test", pointMap); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -76,7 +77,7 @@ public void writePointFromMapAndDynamicDbName() throws InterruptedException { Map pointMap = createMapPoint(); Map header = createHeader(); - sendBody("direct:test", pointMap, header); + TestSupport.sendBody(template, "direct:test", pointMap, header); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -91,7 +92,7 @@ public void missingMeassurementNameFails() throws InterruptedException { Map pointMap = new HashMap<>(); pointMap.remove(InfluxDbConstants.MEASUREMENT_NAME); - sendBody("direct:test", pointMap); + TestSupport.sendBody(template, "direct:test", pointMap); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); diff --git a/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerPingTest.java b/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerPingTest.java index 5495bdfc22a24..d80cfe3b82616 100644 --- a/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerPingTest.java +++ b/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerPingTest.java @@ -19,6 +19,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +50,7 @@ public void ping() throws InterruptedException { successEndpoint.expectedMessageCount(1); - sendBody("direct:test", "test"); + TestSupport.sendBody(template, "direct:test", "test"); successEndpoint.assertIsSatisfied(); } diff --git a/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerTest.java b/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerTest.java index 2bab7e2ffc9ab..dd1dbea6131ce 100644 --- a/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerTest.java +++ b/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/InfluxDb2ProducerTest.java @@ -32,6 +32,7 @@ import org.apache.camel.component.influxdb2.data.Record; import org.apache.camel.component.influxdb2.data.Records; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -79,7 +80,7 @@ public void configure() { Point point = Point.measurement("temperature"); - sendBody("direct:test", point); + TestSupport.sendBody(template, "direct:test", point); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -102,7 +103,7 @@ public void configure() { }); Map pointMap = createMapPoint(); - sendBody("direct:test", pointMap); + TestSupport.sendBody(template, "direct:test", pointMap); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -125,7 +126,7 @@ public void configure() { } }); - sendBody("direct:test", record); + TestSupport.sendBody(template, "direct:test", record); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -152,7 +153,7 @@ public void configure() { Measurement measurement = Measurement.fromObject(temperature); - sendBody("direct:test", measurement); + TestSupport.sendBody(template, "direct:test", measurement); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -177,7 +178,7 @@ public void configure() { } }; - sendBody("direct:test", Points.create(points)); + TestSupport.sendBody(template, "direct:test", Points.create(points)); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -197,7 +198,7 @@ public void configure() { } }); - sendBody("direct:test", Records.create("temperature,location=north value=60.0")); + TestSupport.sendBody(template, "direct:test", Records.create("temperature,location=north value=60.0")); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -224,7 +225,7 @@ public void configure() { Measurement measurement = Measurement.fromObject(temperature); Measurements.create(measurement); - sendBody("direct:test", Records.create("temperature,location=north value=60.0")); + TestSupport.sendBody(template, "direct:test", Records.create("temperature,location=north value=60.0")); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -247,7 +248,7 @@ public void configure() { Map pointMap = createMapPoint(); pointMap.remove(InfluxDb2Constants.MEASUREMENT); - sendBody("direct:test", pointMap); + TestSupport.sendBody(template, "direct:test", pointMap); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java index 39b4e2145e29d..5603c38980c7f 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java @@ -24,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; public class JaxbErrorLogTest extends CamelTestSupport { @@ -35,7 +36,7 @@ public void testErrorHandling() throws Exception { // FailingBean will cause message at index 2 to throw exception for (int i = 0; i < 5; i++) { - sendBody("seda:test", new CannotMarshal(i)); + TestSupport.sendBody(template, "seda:test", new CannotMarshal(i)); } MockEndpoint.assertIsSatisfied(context); diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java index 9282acd2e5041..d2cf22494be55 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java @@ -22,6 +22,7 @@ import javax.cache.Cache; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -37,7 +38,7 @@ public void testClear() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "CLEAR"); - sendBody("direct:clear", null, headers); + TestSupport.sendBody(template, "direct:clear", null, headers); assertFalse(cache.iterator().hasNext()); } diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java index c5cc9e092d9d5..cc21b5d43c9c6 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java @@ -25,6 +25,7 @@ import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -49,7 +50,7 @@ public void testGet() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "GET"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:get", null, headers); + TestSupport.sendBody(template, "direct:get", null, headers); MockEndpoint mock = getMockEndpoint("mock:get"); mock.expectedMinimumMessageCount(1); @@ -78,7 +79,7 @@ public void testGetAndRemove() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "GETANDREMOVE"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:get-and-remove", null, headers); + TestSupport.sendBody(template, "direct:get-and-remove", null, headers); MockEndpoint mock = getMockEndpoint("mock:get-and-remove"); mock.expectedMinimumMessageCount(1); @@ -110,7 +111,7 @@ public void testGetAndReplace() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "GETANDREPLACE"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:get-and-replace", val2, headers); + TestSupport.sendBody(template, "direct:get-and-replace", val2, headers); MockEndpoint mock = getMockEndpoint("mock:get-and-replace"); mock.expectedMinimumMessageCount(1); @@ -140,7 +141,7 @@ public void testGetAndPut() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "GETANDPUT"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:get-and-put", val2, headers); + TestSupport.sendBody(template, "direct:get-and-put", val2, headers); MockEndpoint mock = getMockEndpoint("mock:get-and-put"); mock.expectedMinimumMessageCount(1); @@ -173,7 +174,7 @@ public void testGetAll() throws Exception { headers.put(JCacheConstants.ACTION, "GETALL"); headers.put(JCacheConstants.KEYS, values.keySet()); - sendBody("direct:get-all", values, headers); + TestSupport.sendBody(template, "direct:get-all", values, headers); MockEndpoint mock = getMockEndpoint("mock:get-all"); mock.expectedMinimumMessageCount(1); diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java index d05b0f905ee63..e15cf6e1c2281 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java @@ -29,6 +29,7 @@ import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -57,7 +58,7 @@ public void testInvoke() throws Exception { headers.put(JCacheConstants.KEY, key); headers.put(JCacheConstants.ENTRY_PROCESSOR, ENTRY_PROCESSOR); - sendBody("direct:invoke", null, headers); + TestSupport.sendBody(template, "direct:invoke", null, headers); MockEndpoint mock = getMockEndpoint("mock:invoke"); mock.expectedMinimumMessageCount(1); @@ -91,7 +92,7 @@ public void testInvokeAll() throws Exception { headers.put(JCacheConstants.KEYS, values2.keySet()); headers.put(JCacheConstants.ENTRY_PROCESSOR, ENTRY_PROCESSOR); - sendBody("direct:invoke-all", null, headers); + TestSupport.sendBody(template, "direct:invoke-all", null, headers); MockEndpoint mock = getMockEndpoint("mock:invoke-all"); mock.expectedMinimumMessageCount(1); diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java index 1ca7580ada2d7..17a079d0cbc62 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java @@ -25,6 +25,7 @@ import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -44,7 +45,7 @@ public void testPut() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "PUT"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:put", val, headers); + TestSupport.sendBody(template, "direct:put", val, headers); assertTrue(cache.containsKey(key)); assertEquals(val, cache.get(key)); @@ -60,7 +61,7 @@ public void testPutWithDefaultAction() throws Exception { headers.clear(); headers.put(JCacheConstants.KEY, key); - sendBody("direct:put-with-default-action", val, headers); + TestSupport.sendBody(template, "direct:put-with-default-action", val, headers); assertTrue(cache.containsKey(key)); assertEquals(val, cache.get(key)); @@ -77,7 +78,7 @@ public void testPutIfAbsent() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "PUTIFABSENT"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:put-if-absent", val, headers); + TestSupport.sendBody(template, "direct:put-if-absent", val, headers); assertTrue(cache.containsKey(key)); assertEquals(val, cache.get(key)); @@ -110,7 +111,7 @@ public void testPutIfAbsentFailure() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "PUTIFABSENT"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:put-if-absent", val, headers); + TestSupport.sendBody(template, "direct:put-if-absent", val, headers); MockEndpoint mock = getMockEndpoint("mock:put-if-absent"); mock.expectedMinimumMessageCount(1); @@ -138,7 +139,7 @@ public void testPutAll() throws Exception { headers.put(JCacheConstants.ACTION, "PUTALL"); headers.put(JCacheConstants.KEY, values); - sendBody("direct:put", values, headers); + TestSupport.sendBody(template, "direct:put", values, headers); for (Map.Entry entry : values.entrySet()) { assertTrue(cache.containsKey(entry.getKey())); diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java index e1b01797a71fe..b53f80562f216 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java @@ -23,6 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -43,7 +44,7 @@ public void testRemove() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "REMOVE"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:remove", null, headers); + TestSupport.sendBody(template, "direct:remove", null, headers); MockEndpoint mock = getMockEndpoint("mock:remove"); mock.expectedMinimumMessageCount(1); @@ -68,7 +69,7 @@ public void testRemoveIf() throws Exception { headers.put(JCacheConstants.ACTION, "REMOVE"); headers.put(JCacheConstants.KEY, key); headers.put(JCacheConstants.OLD_VALUE, val); - sendBody("direct:remove-if", null, headers); + TestSupport.sendBody(template, "direct:remove-if", null, headers); MockEndpoint mock = getMockEndpoint("mock:remove-if"); mock.expectedMinimumMessageCount(1); @@ -93,7 +94,7 @@ public void testRemoveIfFailure() throws Exception { headers.put(JCacheConstants.ACTION, "REMOVE"); headers.put(JCacheConstants.KEY, key); headers.put(JCacheConstants.OLD_VALUE, "x"); - sendBody("direct:remove-if-failure", null, headers); + TestSupport.sendBody(template, "direct:remove-if-failure", null, headers); MockEndpoint mock = getMockEndpoint("mock:remove-if-failure"); mock.expectedMinimumMessageCount(1); @@ -114,7 +115,7 @@ public void testRemoveAll() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "REMOVEALL"); - sendBody("direct:remove-all", null, headers); + TestSupport.sendBody(template, "direct:remove-all", null, headers); for (Object key : values.keySet()) { assertFalse(cache.containsKey(key)); @@ -135,7 +136,7 @@ public void testRemoveSubset() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "REMOVEALL"); headers.put(JCacheConstants.KEYS, values2.keySet()); - sendBody("direct:remove-subset", null, headers); + TestSupport.sendBody(template, "direct:remove-subset", null, headers); for (Object key : values1.keySet()) { assertTrue(cache.containsKey(key)); diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java index 982aea06c0890..fa13213a884bc 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java @@ -25,6 +25,7 @@ import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,7 +47,7 @@ public void testReplace() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "REPLACE"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:replace", val1, headers); + TestSupport.sendBody(template, "direct:replace", val1, headers); MockEndpoint mock = getMockEndpoint("mock:replace"); mock.expectedMinimumMessageCount(1); @@ -80,7 +81,7 @@ public void testReplaceIf() throws Exception { headers.put(JCacheConstants.ACTION, "REPLACE"); headers.put(JCacheConstants.KEY, key); headers.put(JCacheConstants.OLD_VALUE, val); - sendBody("direct:replace", val1, headers); + TestSupport.sendBody(template, "direct:replace", val1, headers); MockEndpoint mock = getMockEndpoint("mock:replace"); mock.expectedMinimumMessageCount(1); @@ -114,7 +115,7 @@ public void testReplaceIfFailure() throws Exception { headers.put(JCacheConstants.ACTION, "REPLACE"); headers.put(JCacheConstants.KEY, key); headers.put(JCacheConstants.OLD_VALUE, val1); - sendBody("direct:replace", val1, headers); + TestSupport.sendBody(template, "direct:replace", val1, headers); MockEndpoint mock = getMockEndpoint("mock:replace"); mock.expectedMinimumMessageCount(1); @@ -146,7 +147,7 @@ public void testReplaceFail() throws Exception { headers.clear(); headers.put(JCacheConstants.ACTION, "REPLACE"); headers.put(JCacheConstants.KEY, key); - sendBody("direct:replace-fail", val, headers); + TestSupport.sendBody(template, "direct:replace-fail", val, headers); MockEndpoint mock = getMockEndpoint("mock:replace-fail"); mock.expectedMinimumMessageCount(1); diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java index d608b84799276..14b8c6548ad8c 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java @@ -20,6 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.jgroups.JChannel; import org.jgroups.Message; import org.jgroups.Receiver; @@ -75,7 +76,7 @@ public void doPostTearDown() { @Test public void shouldReceiveMulticastedBody() throws Exception { // When - sendBody("direct:start", MESSAGE); + TestSupport.sendBody(template, "direct:start", MESSAGE); // Then waitForMulticastChannel(5); @@ -85,7 +86,7 @@ public void shouldReceiveMulticastedBody() throws Exception { @Test public void shouldNotSendNullMessage() throws Exception { // When - sendBody("direct:start", null); + TestSupport.sendBody(template, "direct:start", null); // Then waitForMulticastChannel(2); diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java index 4b6755cd139c5..844baf6ba50e3 100644 --- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java +++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java @@ -25,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -43,7 +44,7 @@ public void testFirstSampleJolt() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jolt/firstSample/input.json")); diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java index b971123081a6a..6e82d1e2e87af 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java @@ -23,6 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -41,7 +42,7 @@ public void testJsltAsInputStream() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json")); @@ -53,7 +54,7 @@ public void testInvalidBody() throws Exception { getMockEndpoint("mock:result").expectedMessageCount(0); //type integer is not allowed - sendBody("direct://start", 4); + TestSupport.sendBody(template, "direct://start", 4); MockEndpoint.assertIsSatisfied(context); } @@ -68,7 +69,7 @@ public void testJsltAsText() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", IOHelper.loadText(ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json"))); @@ -88,7 +89,7 @@ public void testJsltAsByteArray() throws Exception { String text = IOHelper.loadText(ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json")); - sendBody("direct://start", text.getBytes(StandardCharsets.UTF_8)); + TestSupport.sendBody(template, "direct://start", text.getBytes(StandardCharsets.UTF_8)); MockEndpoint.assertIsSatisfied(context); } @@ -103,7 +104,7 @@ public void testJsltAsInputStreamPrettyPrint() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://startPrettyPrint", + TestSupport.sendBody(template, "direct://startPrettyPrint", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json"), Collections.singletonMap(JsltConstants.HEADER_JSLT_RESOURCE_URI, diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalCustomObjectMapperTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalCustomObjectMapperTest.java index 5e86f59893d87..8ae3d6a23c714 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalCustomObjectMapperTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalCustomObjectMapperTest.java @@ -28,6 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -57,7 +58,7 @@ public void testJsltAsInputStream() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/useBigDecimal/input.json")); diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalTest.java index 84f079206bba9..ce98ed646260e 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBigDecimalTest.java @@ -25,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -51,7 +52,7 @@ public void testJsltAsInputStream() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/useBigDecimal/input.json")); diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFileSourceTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFileSourceTest.java index 6b7abcc04a738..31142eec6da6b 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFileSourceTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFileSourceTest.java @@ -22,6 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -40,7 +41,7 @@ public void testJsltAsInputStream() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json")); @@ -52,7 +53,7 @@ public void testInvalidBody() throws Exception { getMockEndpoint("mock:result").expectedMessageCount(0); //type integer is not allowed - sendBody("direct://start", 4); + TestSupport.sendBody(template, "direct://start", 4); MockEndpoint.assertIsSatisfied(context); } @@ -67,7 +68,7 @@ public void testJsltAsText() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", IOHelper.loadText(ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json"))); @@ -84,7 +85,7 @@ public void testJsltAsInputStreamPrettyPrint() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://startPrettyPrint", + TestSupport.sendBody(template, "direct://startPrettyPrint", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json"), Collections.singletonMap(JsltConstants.HEADER_JSLT_RESOURCE_URI, diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java index 52a122c71a48f..8caefda1e50d7 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java @@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; /** @@ -53,7 +54,8 @@ public void testSimpleFunction() throws Exception { getMockEndpoint("mock:result").expectedMinimumMessageCount(1); getMockEndpoint("mock:result").expectedBodiesReceived("1024.0"); - sendBody("direct://start", "{}", Collections.singletonMap(JsltConstants.HEADER_JSLT_STRING, "power(2, 10)")); + TestSupport.sendBody(template, "direct://start", "{}", + Collections.singletonMap(JsltConstants.HEADER_JSLT_STRING, "power(2, 10)")); MockEndpoint.assertIsSatisfied(context); } diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java index 20af31fb2b012..e71bb532ce55b 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java @@ -25,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -51,7 +52,7 @@ public void testJsltAsInputStream() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/objectFilter/input.json")); diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java index 3375298e659c2..79492723201f5 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java @@ -22,6 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -35,7 +36,7 @@ public void testSimpleQuery() throws Exception { getMockEndpoint("mock:result").expectedMinimumMessageCount(1); getMockEndpoint("mock:result").expectedBodiesReceived("\"2017-05-04T09:13:29+02:00\""); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", IOHelper.loadText(ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/demoPlayground/input.json")), Collections.singletonMap(JsltConstants.HEADER_JSLT_STRING, ".published")); diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltVariablesTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltVariablesTest.java index 5d7bf155dc304..45c65f92ae926 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltVariablesTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltVariablesTest.java @@ -24,6 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -47,7 +48,7 @@ public void testWithVariables() throws Exception { headers.put("type", "Controller"); //add an infinite recursion value, cannot be serialized with Jackson headers.put("infinite", createInfiniteRecursionObject()); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jslt/withVariables/input.json"), headers); diff --git a/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchComponentTest.java b/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchComponentTest.java index a3e10df8a2aed..042bd023c924d 100644 --- a/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchComponentTest.java +++ b/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchComponentTest.java @@ -19,6 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -28,7 +29,7 @@ public class JsonPatchComponentTest extends CamelTestSupport { @Test public void testCamelJsonPatch() { MockEndpoint mock = getMockEndpoint("mock:result"); - sendBody("direct:foo", "{ \"a\": \"b\" }"); + TestSupport.sendBody(template, "direct:foo", "{ \"a\": \"b\" }"); assertEquals(1, mock.getReceivedExchanges().size()); assertEquals("{\"c\":\"b\"}", mock.getReceivedExchanges().get(0).getIn().getBody(String.class)); } @@ -37,7 +38,7 @@ public void testCamelJsonPatch() { public void testSendToDeadLetterChannelIfPatchError() { MockEndpoint mock = getMockEndpoint("mock:errors"); String source = "{ \"a\": \"b\" }"; - sendBody("direct:patch_error", source); + TestSupport.sendBody(template, "direct:patch_error", source); assertEquals(1, mock.getReceivedExchanges().size()); assertEquals(source, mock.getReceivedExchanges().get(0).getIn().getBody(String.class)); } diff --git a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataArrayInputTest.java b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataArrayInputTest.java index 6b3d357b06e60..ded8c4b5100e5 100644 --- a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataArrayInputTest.java +++ b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataArrayInputTest.java @@ -27,6 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -41,7 +42,7 @@ void testJsonArrayInputAsString() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start-string", + TestSupport.sendBody(template, "direct://start-string", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jsonata/arrayinput/input.json")); @@ -63,7 +64,7 @@ void testJsonArrayInputAsJacksonNode() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start-jackson", body); + TestSupport.sendBody(template, "direct://start-jackson", body); MockEndpoint.assertIsSatisfied(context); } diff --git a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java index 66b3384a59178..f41f7410fbb17 100644 --- a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java +++ b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java @@ -24,6 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -41,7 +42,7 @@ void testFirstSampleJsonata() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jsonata/firstSample/input.json")); diff --git a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFrameBindingTest.java b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFrameBindingTest.java index 9c0e2db710c10..fb084db36e9a0 100644 --- a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFrameBindingTest.java +++ b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFrameBindingTest.java @@ -21,6 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -53,7 +54,7 @@ void testFrameBindingJsonata() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jsonata/frameBinding/input.json")); diff --git a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataJacksonOutputTest.java b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataJacksonOutputTest.java index 759dbd64e236b..d526ceabd5c8f 100644 --- a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataJacksonOutputTest.java +++ b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataJacksonOutputTest.java @@ -24,6 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -41,7 +42,7 @@ void testFirstSampleJsonata() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jsonata/firstSample/input.json")); diff --git a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataRefTest.java b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataRefTest.java index 55b585d86cd81..e5d8f7ef533b3 100644 --- a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataRefTest.java +++ b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataRefTest.java @@ -20,6 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -41,7 +42,7 @@ void testRef() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jsonata/firstSample/input.json")); diff --git a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataTemplateFromHeaderTest.java b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataTemplateFromHeaderTest.java index fe3399b380cb1..45a3ac570396a 100644 --- a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataTemplateFromHeaderTest.java +++ b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataTemplateFromHeaderTest.java @@ -20,6 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -41,7 +42,7 @@ void testFromHeader() throws Exception { .trim() // Remove the last newline added by IOHelper.loadText() ); - sendBody("direct://start", + TestSupport.sendBody(template, "direct://start", ResourceHelper.resolveMandatoryResourceAsInputStream( context, "org/apache/camel/component/jsonata/firstSample/input.json")); diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java index 95c8b877f615b..486ba1321cc05 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java @@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,7 +47,7 @@ public void configure() { public void testUTF16BEFile() throws Exception { getMockEndpoint("mock:authors").expectedMessageCount(1); - sendBody("direct:start", new File("src/test/resources/booksUTF16BE.json")); + TestSupport.sendBody(template, "direct:start", new File("src/test/resources/booksUTF16BE.json")); MockEndpoint.assertIsSatisfied(context); @@ -57,7 +58,7 @@ public void testUTF16BEFile() throws Exception { public void testUTF16LEFile() throws Exception { getMockEndpoint("mock:authors").expectedMessageCount(1); - sendBody("direct:start", new File("src/test/resources/booksUTF16LE.json")); + TestSupport.sendBody(template, "direct:start", new File("src/test/resources/booksUTF16LE.json")); MockEndpoint.assertIsSatisfied(context); @@ -70,7 +71,7 @@ public void testUTF16BEInputStream() throws Exception { InputStream input = JsonPathCharsetTest.class.getClassLoader().getResourceAsStream("booksUTF16BE.json"); assertNotNull(input); - sendBody("direct:start", input); + TestSupport.sendBody(template, "direct:start", input); MockEndpoint.assertIsSatisfied(context); @@ -83,7 +84,7 @@ public void testUTF16BEURL() throws Exception { URL url = new URL("file:src/test/resources/booksUTF16BE.json"); assertNotNull(url); - sendBody("direct:start", url); + TestSupport.sendBody(template, "direct:start", url); check(); } @@ -94,7 +95,7 @@ public void testISO8859WithJsonHeaderCamelJsonInputEncoding() throws Exception { URL url = new URL("file:src/test/resources/germanbooks-iso-8859-1.json"); assertNotNull(url); - sendBody("direct:start", url, + TestSupport.sendBody(template, "direct:start", url, Collections. singletonMap(JsonPathConstants.HEADER_JSON_ENCODING, "ISO-8859-1")); check("Joseph und seine Brüder", "Götzendämmerung"); diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java index f090c4340ef3a..b986d9a501ead 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java @@ -19,6 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; /** @@ -41,7 +42,7 @@ public void testBasicTest() throws Exception { if (SYSTEM != null) { MockEndpoint endpoint = getMockEndpoint("mock:a"); endpoint.expectedBodiesReceived("Test message"); - sendBody("direct:a", "Test message"); + TestSupport.sendBody(template, "direct:a", "Test message"); endpoint.assertIsSatisfied(); } } diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java index 4279857f5d68a..19181cd533dbf 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java @@ -22,6 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -69,7 +70,7 @@ public void run() { } }; endpoint.expects(runnable); - sendBody("direct:a", new String[] { "1234", "", "" }); + TestSupport.sendBody(template, "direct:a", new String[] { "1234", "", "" }); endpoint.assertIsSatisfied(); } } diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java index 9385c7751c21d..42b9f841e55da 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java @@ -19,6 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; /** @@ -41,7 +42,7 @@ public void testBasicTest() throws Exception { if (SYSTEM != null) { MockEndpoint endpoint = getMockEndpoint("mock:a"); endpoint.expectedBodiesReceived("Test message"); - sendBody("direct:a", "Test message"); + TestSupport.sendBody(template, "direct:a", "Test message"); endpoint.assertIsSatisfied(); } } diff --git a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduProducerTest.java b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduProducerTest.java index d318fb59cae00..28978a9e207b4 100644 --- a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduProducerTest.java +++ b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduProducerTest.java @@ -26,6 +26,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.apache.kudu.ColumnSchema; import org.apache.kudu.Schema; import org.apache.kudu.Type; @@ -136,7 +137,7 @@ public void insertRow() throws InterruptedException { row.put("lastname", "Smith"); row.put("address", "4359 Plainfield Avenue"); - sendBody("direct:insert", row); + TestSupport.sendBody(template, "direct:insert", row); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -155,7 +156,7 @@ public void insertRowDifferentData() throws InterruptedException { row.put("_double", ThreadLocalRandom.current().nextDouble(9000, 9999)); row.put("_float", ThreadLocalRandom.current().nextFloat() * (499 - 100) + 100); - sendBody("direct:data", row); + TestSupport.sendBody(template, "direct:data", row); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -175,12 +176,12 @@ public void insertAndDelete() throws InterruptedException, KuduException { row.put("name", "Samuel"); row.put("lastname", "Smith"); row.put("address", "4359 Plainfield Avenue"); - sendBody("direct:insert", row); + TestSupport.sendBody(template, "direct:insert", row); // Then delete it row = new HashMap<>(); row.put("id", 5); - sendBody("direct:delete", row); + TestSupport.sendBody(template, "direct:delete", row); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -213,13 +214,13 @@ public void insertAndUpdate() throws InterruptedException, KuduException { row.put("name", "Samuel"); row.put("lastname", "Smith"); row.put("address", "4359 Plainfield Avenue"); - sendBody("direct:insert", row); + TestSupport.sendBody(template, "direct:insert", row); // Then update it row = new HashMap<>(); row.put("id", 5); row.put("name", "John"); - sendBody("direct:update", row); + TestSupport.sendBody(template, "direct:update", row); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -254,12 +255,12 @@ public void insertAndUpsert() throws InterruptedException, KuduException { row.put("name", "Samuel"); row.put("lastname", "Smith"); row.put("address", "4359 Plainfield Avenue"); - sendBody("direct:insert", row); + TestSupport.sendBody(template, "direct:insert", row); // Then update by upsert row.put("id", 5); row.put("name", "John"); - sendBody("direct:upsert", row); + TestSupport.sendBody(template, "direct:upsert", row); // And insert by upsert row = new HashMap<>(); @@ -268,7 +269,7 @@ public void insertAndUpsert() throws InterruptedException, KuduException { row.put("name", "Mary"); row.put("lastname", "Smith"); row.put("address", "4359 Plainfield Avenue"); - sendBody("direct:upsert", row); + TestSupport.sendBody(template, "direct:upsert", row); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); diff --git a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduScanTest.java b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduScanTest.java index cad023fa939a3..60f2d40681203 100644 --- a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduScanTest.java +++ b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduScanTest.java @@ -25,6 +25,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.apache.kudu.ColumnSchema; import org.apache.kudu.Type; import org.apache.kudu.client.KuduPredicate; @@ -76,7 +77,7 @@ public void scan() throws InterruptedException { errorEndpoint.expectedMessageCount(0); successEndpoint.expectedMessageCount(1); - sendBody("direct:scan", null); + TestSupport.sendBody(template, "direct:scan", null); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); @@ -120,7 +121,7 @@ public void scanWithPredicate() throws InterruptedException { // without predicate Map headers = new HashMap<>(); headers.put(KuduConstants.CAMEL_KUDU_SCAN_PREDICATE, null); - sendBody("direct:scan", null, headers); + TestSupport.sendBody(template, "direct:scan", null, headers); List> results = (List>) successEndpoint.getReceivedExchanges() .get(0).getIn().getBody(List.class); assertEquals(2, results.size(), "two records with id=1 and id=2 are expected to be returned"); @@ -129,7 +130,7 @@ public void scanWithPredicate() throws InterruptedException { ColumnSchema schema = new ColumnSchema.ColumnSchemaBuilder("id", Type.INT32).build(); KuduPredicate predicate = KuduPredicate.newComparisonPredicate(schema, KuduPredicate.ComparisonOp.EQUAL, 2); headers.put(KuduConstants.CAMEL_KUDU_SCAN_PREDICATE, predicate); - sendBody("direct:scan", null, headers); + TestSupport.sendBody(template, "direct:scan", null, headers); results = (List>) successEndpoint.getReceivedExchanges() .get(1).getIn().getBody(List.class); assertEquals(1, results.size(), "only one record with id=2 is expected to be returned"); @@ -146,7 +147,7 @@ public void scanWithColumnNames() throws InterruptedException { // without column names Map headers = new HashMap<>(); headers.put(KuduConstants.CAMEL_KUDU_SCAN_COLUMN_NAMES, null); - sendBody("direct:scan", null, headers); + TestSupport.sendBody(template, "direct:scan", null, headers); List> results = (List>) successEndpoint.getReceivedExchanges() .get(0).getIn().getBody(List.class); assertEquals(5, results.get(0).size(), "returned rows are expected to have 5 columns"); @@ -154,7 +155,7 @@ public void scanWithColumnNames() throws InterruptedException { // with column names List columnNames = Arrays.asList("id", "name"); headers.put(KuduConstants.CAMEL_KUDU_SCAN_COLUMN_NAMES, columnNames); - sendBody("direct:scan", null, headers); + TestSupport.sendBody(template, "direct:scan", null, headers); results = (List>) successEndpoint.getReceivedExchanges().get(1).getIn().getBody(List.class); Map result = results.get(0); assertEquals(2, result.size(), "returned rows are expected to have only 2 columns"); @@ -174,14 +175,14 @@ public void scanWithLimit() throws InterruptedException { // without limit Map headers = new HashMap<>(); headers.put(KuduConstants.CAMEL_KUDU_SCAN_LIMIT, null); - sendBody("direct:scan", null, headers); + TestSupport.sendBody(template, "direct:scan", null, headers); List> results = (List>) successEndpoint.getReceivedExchanges() .get(0).getIn().getBody(List.class); assertEquals(2, results.size(), "returned result is expected to have 2 rows"); // with limit headers.put(KuduConstants.CAMEL_KUDU_SCAN_LIMIT, 1L); - sendBody("direct:scan", null, headers); + TestSupport.sendBody(template, "direct:scan", null, headers); results = (List>) successEndpoint.getReceivedExchanges().get(1).getIn().getBody(List.class); assertEquals(1, results.size(), "returned result is expected to have only 1 row"); @@ -197,7 +198,7 @@ public void scanTable() throws InterruptedException { errorEndpoint.expectedMessageCount(0); successEndpoint.expectedMessageCount(1); - sendBody("direct:scan2", null); + TestSupport.sendBody(template, "direct:scan2", null); errorEndpoint.assertIsSatisfied(); successEndpoint.assertIsSatisfied(); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java index 628aa1b5c8f84..1b43b7eae901f 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.netty; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; @@ -34,7 +35,7 @@ public void canSupplyMultipleCodecsToEndpointPipeline() throws Exception { String poem = new Poetry().getPoem(); MockEndpoint mock = getMockEndpoint("mock:multiple-codec"); mock.expectedBodiesReceived(poem); - sendBody("direct:multiple-codec", poem); + TestSupport.sendBody(template, "direct:multiple-codec", poem); mock.assertIsSatisfied(); } } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java index 7f2bd821f80ab..ec646165c4a26 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java @@ -27,6 +27,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; public class MultipleCodecsTest extends BaseNettyTest { @@ -68,7 +69,7 @@ public void canSupplyMultipleCodecsToEndpointPipeline() throws Exception { String poem = new Poetry().getPoem(); MockEndpoint mock = getMockEndpoint("mock:multiple-codec"); mock.expectedBodiesReceived(poem); - sendBody("direct:multiple-codec", poem); + TestSupport.sendBody(template, "direct:multiple-codec", poem); mock.await(1, TimeUnit.SECONDS); mock.assertIsSatisfied(); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java index cf339c8a2066f..dd8e54a7d6a64 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java @@ -36,6 +36,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -117,7 +118,7 @@ public void testExceptionHandler() throws Exception { exception.setExpectedMessageCount(1); - sendBody("direct:start", LARGE_BUFFER_BODY); + TestSupport.sendBody(template, "direct:start", LARGE_BUFFER_BODY); exception.assertIsSatisfied(); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java index abc3959343ff0..eab1e2e9a9f02 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java @@ -23,6 +23,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; public class NettySingleCodecTest extends BaseNettyTest { @@ -38,7 +39,7 @@ public void canSupplySingleCodecToEndpointPipeline() throws Exception { String poem = new Poetry().getPoem(); MockEndpoint mock = getMockEndpoint("mock:single-codec"); mock.expectedBodiesReceived(poem); - sendBody("direct:single-codec", poem); + TestSupport.sendBody(template, "direct:single-codec", poem); mock.await(1, TimeUnit.SECONDS); mock.assertIsSatisfied(); diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java index fb643ac28b898..1be6e2a86729c 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java @@ -26,6 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoSettings; @@ -87,7 +88,7 @@ public void dynamicJobFailsIfHeaderNotPressent() throws Exception { errorEndpoint.expectedMessageCount(1); //dynamic job should fail as header is not present and the job is dynamic - sendBody("direct:dyanmic?block=false", "Start the job, please."); + TestSupport.sendBody(template, "direct:dyanmic?block=false", "Start the job, please."); mockEndpoint.assertIsSatisfied(); mockEndpoint.assertIsSatisfied(); } @@ -100,7 +101,7 @@ public void dynamicJobFailsIfHeaderWithInvalidJobName() throws Exception { //dynamic job should fail as header is present but the job does not exist header(SpringBatchConstants.JOB_NAME).append("thisJobDoesNotExsistAtAll" + Date.from(Instant.now())); - sendBody("direct:dyanmic?block=false", "Start the job, please."); + TestSupport.sendBody(template, "direct:dyanmic?block=false", "Start the job, please."); mockEndpoint.assertIsSatisfied(); mockEndpoint.assertIsSatisfied(); @@ -115,7 +116,7 @@ public void dynamicJobWorksIfHeaderPressentWithValidJob() throws Exception { final Map headers = new HashMap<>(); headers.put(SpringBatchConstants.JOB_NAME, "dynamicMockjob"); - sendBody("direct:dynamic?block=false", "Start the job, please.", headers); + TestSupport.sendBody(template, "direct:dynamic?block=false", "Start the job, please.", headers); mockEndpoint.assertIsSatisfied(); errorEndpoint.assertIsSatisfied(); @@ -133,7 +134,7 @@ public void dynamicJobWorksIfHeaderPresentWithValidJobLocatedInJobRegistry() thr headers.put(SpringBatchConstants.JOB_NAME, "dyanmicMockJobFromJobRegistry"); headers.put("jobRegistry", "#jobRegistry"); - sendBody("direct:dynamicWithJobRegistry", "Start the job, please.", headers); + TestSupport.sendBody(template, "direct:dynamicWithJobRegistry", "Start the job, please.", headers); mockEndpoint.assertIsSatisfied(); errorEndpoint.assertIsSatisfied(); diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java index 4a3f40538f826..231a75299072d 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java @@ -27,6 +27,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -105,7 +106,7 @@ public void shouldInjectJobToEndpoint() throws IllegalAccessException { @Test public void shouldRunJob() throws Exception { // When - sendBody("direct:start", "Start the job, please."); + TestSupport.sendBody(template, "direct:start", "Start the job, please."); // Then verify(jobLauncher).run(eq(job), any(JobParameters.class)); @@ -118,7 +119,7 @@ public void shouldReturnJobExecution() throws Exception { when(jobLauncher.run(eq(job), any(JobParameters.class))).thenReturn(jobExecution); // When - sendBody("direct:start", "Start the job, please."); + TestSupport.sendBody(template, "direct:start", "Start the job, please."); // Then mockEndpoint.expectedBodiesReceived(jobExecution); diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java index 070bf3d17781c..6cba04290e937 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.spring.batch.support; import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,7 +35,7 @@ public class CamelItemReaderTest extends CamelTestSupport { @Override protected void doPostSetup() throws Exception { camelItemReader = new CamelItemReader<>(consumer(), "seda:start"); - sendBody("seda:start", message); + TestSupport.sendBody(template, "seda:start", message); } // Tests