diff --git a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml index b8eeee6c21f14..6e11e4c54b1ff 100644 --- a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml +++ b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java index 2c0e423db6dfc..a88289c751b8b 100644 --- a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java +++ b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties b/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties index dcc90e11d48ad..27cdb823ba4c6 100644 --- a/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties +++ b/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties @@ -28,7 +28,7 @@ maven-compiler-plugin-version=${maven-compiler-plugin-version} maven-resources-plugin-version=${maven-resources-plugin-version} maven-javadoc-plugin-version=${maven-javadoc-plugin-version} build-helper-maven-plugin-version=${build-helper-maven-plugin-version} -junit-jupiter-version=${junit-jupiter-version} +junit-jupiter-version=${junit6-jupiter-version} slf4j-version=${slf4j-version} log4j2-version=${log4j2-version} maven-surefire-plugin-version=${maven-surefire-plugin-version} \ No newline at end of file diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml index 33031a20f7034..fc65ac352ba44 100644 --- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java index f573b868c48b4..5cb9f189f19cd 100644 --- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java +++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties b/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties index 374fa9ada2c94..39860991c4444 100644 --- a/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties +++ b/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties @@ -28,6 +28,6 @@ maven-resources-plugin-version=${maven-resources-plugin-version} maven-surefire-plugin-version=${maven-surefire-plugin-version} maven-javadoc-plugin-version=${maven-javadoc-plugin-version} build-helper-maven-plugin-version=${build-helper-maven-plugin-version} -junit-jupiter-version=${junit-jupiter-version} +junit-jupiter-version=${junit6-jupiter-version} slf4j-version=${slf4j-version} log4j2-version=${log4j2-version} \ No newline at end of file diff --git a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml index 7e6f3d4990c50..92b0876c02932 100644 --- a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml @@ -68,7 +68,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java index e31fd04c52689..8bbf39f79a3aa 100644 --- a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java +++ b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml index e6ac3fab35d6e..25b480f35e6d8 100644 --- a/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml @@ -74,7 +74,7 @@ org.apache.camel - camel-test-main-junit5 + camel-test-main-junit6 test diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml index 80cdbd0d2ae5f..4825eac9aa393 100644 --- a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml @@ -90,7 +90,7 @@ org.apache.camel - camel-test-main-junit5 + camel-test-main-junit6 test diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java index 30c9015851770..3b697074b6eb6 100644 --- a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java +++ b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.NotifyBuilder; -import org.apache.camel.test.main.junit5.CamelMainTestSupport; +import org.apache.camel.test.main.junit6.CamelMainTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml index 241303b9c2f69..24ca8a48963f7 100644 --- a/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1a5a54b79f7c1..922bb8b9045c9 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json index aa4bc0c7e89a7..1cdc41b2657a1 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json @@ -43,7 +43,7 @@ "maxConcurrentConsumers": { "index": 16, "kind": "property", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, "messageListenerContainerType": { "index": 17, "kind": "property", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "index": 18, "kind": "property", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 250, "description": "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput." }, - "retry": { "index": 19, "kind": "property", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, + "retry": { "index": 19, "kind": "property", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, "shutdownTimeout": { "index": 20, "kind": "property", "displayName": "Shutdown Timeout", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout." }, "allowNullBody": { "index": 21, "kind": "property", "displayName": "Allow Null Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown." }, "autoDeclareProducer": { "index": 22, "kind": "property", "displayName": "Auto Declare Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether the producer should auto declare binding between exchange, queue and routing key when starting. Enabling this can be good for development to make it easy to standup exchanges, queues and bindings on the broker." }, @@ -106,7 +106,7 @@ "maxConcurrentConsumers": { "index": 24, "kind": "parameter", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, "messageListenerContainerType": { "index": 25, "kind": "parameter", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "index": 26, "kind": "parameter", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput." }, - "retry": { "index": 27, "kind": "parameter", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, + "retry": { "index": 27, "kind": "parameter", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, "allowNullBody": { "index": 28, "kind": "parameter", "displayName": "Allow Null Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown." }, "autoDeclareProducer": { "index": 29, "kind": "parameter", "displayName": "Auto Declare Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether the producer should auto declare binding between exchange, queue and routing key when starting." }, "confirm": { "index": 30, "kind": "parameter", "displayName": "Confirm", "group": "producer", "label": "producer", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "auto", "description": "Controls whether to wait for confirms. The connection factory must be configured for publisher confirms and this method. auto = Camel detects if the connection factory uses confirms or not. disabled = Confirms is disabled. enabled = Confirms is enabled." }, diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index 8a1a207b84b6a..64a3234dedc5a 100644 --- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -106,7 +106,7 @@ public void testFindComponentNames() { public void testFindOtherNames() { List names = catalog.findOtherNames(); - assertTrue(names.contains("test-spring-junit5")); + assertTrue(names.contains("test-spring-junit6")); assertFalse(names.contains("http-common")); assertFalse(names.contains("kura")); diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml index bcba98e9d51fd..4f1a8617d1f0a 100644 --- a/catalog/camel-report-maven-plugin/pom.xml +++ b/catalog/camel-report-maven-plugin/pom.xml @@ -184,13 +184,13 @@ org.junit.jupiter junit-jupiter - ${junit-jupiter-version} + ${junit6-jupiter-version} test org.junit.jupiter junit-jupiter-params - ${junit-jupiter-version} + ${junit6-jupiter-version} test diff --git a/catalog/camel-route-parser/pom.xml b/catalog/camel-route-parser/pom.xml index dc630e689de60..4478ec63e2b1e 100644 --- a/catalog/camel-route-parser/pom.xml +++ b/catalog/camel-route-parser/pom.xml @@ -82,7 +82,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 ${project.version} test diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java index b1e91a4d0be12..73c3086c26baf 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java index b0f0a7d9cd1da..633147b20751b 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java @@ -17,7 +17,7 @@ package org.apache.camel.parser.java; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java index b974af4ee565e..9a1c658a69201 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java @@ -18,7 +18,7 @@ import org.apache.camel.FailedToStartRouteException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java index 4e48a8a6153b6..1bfba6b6764f3 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java @@ -17,7 +17,7 @@ package org.apache.camel.parser.java; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java index be5681f63123b..84b71d13712d1 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java @@ -17,7 +17,7 @@ package org.apache.camel.parser.java; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java index 236a08e94727c..db8d606b12ef4 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.parser.RouteBuilderParser; import org.apache.camel.parser.model.CamelNodeDetails; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jboss.forge.roaster.Roaster; import org.jboss.forge.roaster.model.source.JavaClassSource; import org.junit.jupiter.api.Test; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java index fd22fa985aa7d..7f1994e43b64f 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.parser.RouteBuilderParser; import org.apache.camel.parser.model.CamelNodeDetails; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jboss.forge.roaster.Roaster; import org.jboss.forge.roaster.model.source.JavaClassSource; import org.junit.jupiter.api.Test; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java index 215fc7d0e373d..a1c4cf33f9b5f 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java @@ -21,7 +21,7 @@ import org.apache.camel.parser.RouteBuilderParser; import org.apache.camel.parser.model.CamelNodeDetails; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jboss.forge.roaster.Roaster; import org.jboss.forge.roaster.model.source.JavaClassSource; import org.junit.jupiter.api.Test; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java index 8002aac02dffa..a6fa61158ba7c 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java @@ -22,7 +22,7 @@ import org.apache.camel.parser.RestDslParser; import org.apache.camel.parser.model.RestConfigurationDetails; import org.apache.camel.parser.model.RestServiceDetails; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jboss.forge.roaster.Roaster; import org.jboss.forge.roaster.model.source.JavaClassSource; import org.junit.jupiter.api.Test; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java index 00c8ae7365def..eac3958181806 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java @@ -17,7 +17,7 @@ package org.apache.camel.parser.java; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java index 359a7247b17c1..2ba9c09c353cc 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SplitTokenizeTest extends CamelTestSupport { diff --git a/components/camel-ai/camel-chatscript/pom.xml b/components/camel-ai/camel-chatscript/pom.xml index 8ffd2bbe6f304..8c56637f5c3b2 100644 --- a/components/camel-ai/camel-chatscript/pom.xml +++ b/components/camel-ai/camel-chatscript/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java b/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java index 669514eda1fd2..80cb589677ec1 100644 --- a/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java +++ b/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java @@ -26,7 +26,7 @@ import org.apache.camel.model.language.SimpleExpression; import org.apache.camel.test.infra.chatscript.services.ChatScriptService; import org.apache.camel.test.infra.chatscript.services.ChatScriptServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; diff --git a/components/camel-ai/camel-djl/pom.xml b/components/camel-ai/camel-djl/pom.xml index 3b141a43d5502..78a6248deaf76 100644 --- a/components/camel-ai/camel-djl/pom.xml +++ b/components/camel-ai/camel-djl/pom.xml @@ -131,7 +131,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java index 797b60e0b8ede..a53e72e44468e 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java @@ -28,7 +28,7 @@ import ai.djl.modality.audio.translator.SpeechRecognitionTranslator; import ai.djl.util.ZipUtils; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java index 9f6bef79ae690..1341238f4dd00 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java index 26332ebd0146a..0a1bc614c1dd4 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java @@ -33,7 +33,7 @@ import ai.djl.translate.Translator; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java index 74d679ff5a6c2..7348be4a95d56 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java index 544b5a40da9e1..d836c84243810 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java @@ -35,7 +35,7 @@ import ai.djl.translate.TranslatorContext; import ai.djl.util.TarUtils; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java index cab9215fc5de4..208881c7aafea 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java index 19a1333420cc0..0539e8aaa801b 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java index 7c43b852bf703..4c9bf6262d590 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java index b1221bc760ba9..1562025e268d4 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java @@ -18,7 +18,7 @@ import ai.djl.modality.cv.Image; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java index 1489331e4f2bf..0d875edec5025 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java index e17ecd34bff70..1eef294f2cd76 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java index 3015df17a1bb8..7c4620bf3ef63 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java @@ -19,7 +19,7 @@ import java.util.List; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java index 93625190cfe7f..dba7b49bc5535 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.djl; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java index c6e1292858d21..e13666e840a81 100644 --- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java +++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java @@ -22,7 +22,7 @@ import ai.djl.timeseries.TimeSeriesData; import ai.djl.timeseries.dataset.FieldName; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-docling/pom.xml b/components/camel-ai/camel-docling/pom.xml index d9b4ace8995a7..5ba70fc4dd422 100644 --- a/components/camel-ai/camel-docling/pom.xml +++ b/components/camel-ai/camel-docling/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java index 3b936a7cddd79..e1d902ce1c293 100644 --- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java +++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java @@ -19,7 +19,7 @@ import java.util.List; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java index d852bb04577ed..3030bfdba594e 100644 --- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java +++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.docling; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java index b445cb7dad4a8..a375c09684f53 100644 --- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java +++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java @@ -20,7 +20,7 @@ import java.nio.file.Path; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java index ddc48b350a7aa..2cced30c967b0 100644 --- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java +++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java @@ -20,7 +20,7 @@ import java.nio.file.Path; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java index 458f0bcaab8e3..8c00586abd3c2 100644 --- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java +++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java @@ -21,7 +21,7 @@ import org.apache.camel.component.docling.DoclingConfiguration; import org.apache.camel.test.infra.docling.services.DoclingService; import org.apache.camel.test.infra.docling.services.DoclingServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java index 59613b16b3c38..9a6e0bb58b52c 100644 --- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java +++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java @@ -32,7 +32,7 @@ import org.apache.camel.component.docling.DoclingConfiguration; import org.apache.camel.test.infra.docling.services.DoclingService; import org.apache.camel.test.infra.docling.services.DoclingServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-kserve/pom.xml b/components/camel-ai/camel-kserve/pom.xml index 0eec50ee94be3..35200fc278142 100644 --- a/components/camel-ai/camel-kserve/pom.xml +++ b/components/camel-ai/camel-kserve/pom.xml @@ -78,7 +78,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java b/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java index 62db7c3c52a4d..b9585ab800056 100644 --- a/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java +++ b/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.component.kserve.KServeComponent; import org.apache.camel.test.infra.triton.services.TritonService; import org.apache.camel.test.infra.triton.services.TritonServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; class KServeITSupport extends CamelTestSupport { diff --git a/components/camel-ai/camel-langchain4j-agent/pom.xml b/components/camel-ai/camel-langchain4j-agent/pom.xml index 2336ee7ea209d..3d569258a534b 100644 --- a/components/camel-ai/camel-langchain4j-agent/pom.xml +++ b/components/camel-ai/camel-langchain4j-agent/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java index c1062d13a9378..0039d780a3b72 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java @@ -23,7 +23,7 @@ import dev.langchain4j.rag.RetrievalAugmentor; import dev.langchain4j.store.memory.chat.ChatMemoryStore; import org.apache.camel.component.langchain4j.agent.pojos.PersistentChatMemoryStore; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static dev.langchain4j.model.openai.OpenAiChatModelName.GPT_4_O_MINI; import static java.time.Duration.ofSeconds; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java index b7dde7d41540f..5093084c570de 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java index 70f975f4bc57d..cd3847a1d0757 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java index 163c046169e2f..eb5f4e28b2bf9 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java @@ -35,7 +35,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java index f12945fd8d941..7809e29b9c55c 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java index 9715236d4b2e4..ef96f694824fa 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java @@ -33,7 +33,7 @@ import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; import org.apache.camel.test.infra.ollama.services.OpenAIService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java index 667f997b7e249..59fc757e35477 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java index 81d4b8e4017f8..ef68ada0b565f 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java index 994675473156b..41a64f3f99e4c 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java @@ -29,7 +29,7 @@ import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; import org.apache.camel.test.infra.ollama.services.OpenAIService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java index 76c8a6f038bc4..3842694835d8e 100644 --- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java +++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-chat/pom.xml b/components/camel-ai/camel-langchain4j-chat/pom.xml index 36dfae115a5f5..733654140d44d 100644 --- a/components/camel-ai/camel-langchain4j-chat/pom.xml +++ b/components/camel-ai/camel-langchain4j-chat/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java index 7824a084d7df1..edcc7777ad7d5 100644 --- a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java +++ b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; import org.apache.camel.test.infra.ollama.services.OpenAIService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import static java.time.Duration.ofSeconds; diff --git a/components/camel-ai/camel-langchain4j-core/pom.xml b/components/camel-ai/camel-langchain4j-core/pom.xml index 4e9704e190024..8b12c59a20c95 100644 --- a/components/camel-ai/camel-langchain4j-core/pom.xml +++ b/components/camel-ai/camel-langchain4j-core/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java b/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java index 68c071b9f1c32..d646b50f27b00 100644 --- a/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java +++ b/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-ai/camel-langchain4j-embeddings/pom.xml b/components/camel-ai/camel-langchain4j-embeddings/pom.xml index 9821f4f0386ce..f6dd5e308ea26 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/pom.xml +++ b/components/camel-ai/camel-langchain4j-embeddings/pom.xml @@ -104,7 +104,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java index b8eee03e3c523..ecba3ae975901 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java @@ -42,7 +42,7 @@ import org.apache.camel.support.task.budget.IterationBoundedBudget; import org.apache.camel.test.infra.infinispan.services.InfinispanService; import org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.SystemUtils; import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java index bd7473053fb2c..225c65497fd2d 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java @@ -40,7 +40,7 @@ import org.apache.camel.component.milvus.MilvusHeaders; import org.apache.camel.test.infra.milvus.services.MilvusService; import org.apache.camel.test.infra.milvus.services.MilvusServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.util.Lists; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java index 30c5268427ef6..27d3c42507dce 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java @@ -33,7 +33,7 @@ import org.apache.camel.spi.DataType; import org.apache.camel.test.infra.neo4j.services.Neo4jService; import org.apache.camel.test.infra.neo4j.services.Neo4jServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java index c8dc1a740517b..e798312916df7 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java @@ -29,7 +29,7 @@ import org.apache.camel.component.pinecone.PineconeVectorDbAction; import org.apache.camel.component.pinecone.PineconeVectorDbHeaders; import org.apache.camel.spi.DataType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.*; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java index 1e9d3a0cdb813..8f62202f4869b 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java @@ -32,7 +32,7 @@ import org.apache.camel.spi.DataType; import org.apache.camel.test.infra.qdrant.services.QdrantService; import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java index b2e40e835fba3..dab50c117a08c 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java @@ -23,7 +23,7 @@ import dev.langchain4j.store.embedding.RelevanceScore; import org.apache.camel.CamelContext; import org.apache.camel.Message; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java index f848661ad1179..f4212d6cf83af 100644 --- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java @@ -36,7 +36,7 @@ import org.apache.camel.spi.DataType; import org.apache.camel.test.infra.weaviate.services.WeaviateService; import org.apache.camel.test.infra.weaviate.services.WeaviateServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml b/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml index 00cae3171c921..fd1afe6bc766d 100644 --- a/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml +++ b/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java index c38bde8069027..ed75a6e3035fe 100644 --- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java @@ -35,7 +35,7 @@ import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreHeaders; import org.apache.camel.test.infra.milvus.services.MilvusService; import org.apache.camel.test.infra.milvus.services.MilvusServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java index 058347e7aa660..02e2141482ef7 100644 --- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java @@ -40,7 +40,7 @@ import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreHeaders; import org.apache.camel.test.infra.qdrant.services.QdrantService; import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java index 48262997f1928..982f11414c77c 100644 --- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java +++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java @@ -26,7 +26,7 @@ import org.apache.camel.Message; import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStore; import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreComponent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class LangChain4jEmbeddingStoreComponentTest extends CamelTestSupport { diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java index 62fc25626a1bf..b5cb749c6fecb 100644 --- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java +++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java @@ -37,7 +37,7 @@ import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreHeaders; import org.apache.camel.test.infra.weaviate.services.WeaviateService; import org.apache.camel.test.infra.weaviate.services.WeaviateServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/components/camel-ai/camel-langchain4j-tokenizer/pom.xml b/components/camel-ai/camel-langchain4j-tokenizer/pom.xml index 8c1b5f0fbbabb..094e024eb2e6b 100644 --- a/components/camel-ai/camel-langchain4j-tokenizer/pom.xml +++ b/components/camel-ai/camel-langchain4j-tokenizer/pom.xml @@ -83,7 +83,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java b/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java index 93a53f8f6905f..175714da565fc 100644 --- a/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java +++ b/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class LangChain4JTokenizerTestSupport extends CamelTestSupport { protected static final String TEXT; diff --git a/components/camel-ai/camel-langchain4j-tools/pom.xml b/components/camel-ai/camel-langchain4j-tools/pom.xml index b43d0ec68e8a2..5ada76b1175ea 100644 --- a/components/camel-ai/camel-langchain4j-tools/pom.xml +++ b/components/camel-ai/camel-langchain4j-tools/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -82,7 +82,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java index b052991dee966..39a60358a9be0 100644 --- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java +++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java index d5e01e5d9a82c..6a251f6092955 100644 --- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java +++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java index 2ba77524fecfc..533f24dc9bf6c 100644 --- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java +++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java index 9518982b3b4ad..61e76ceaea363 100644 --- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java +++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java index 80dc463a6c002..554e33cdb3749 100644 --- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java +++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java index 9115879d84dc3..d5f6c7d88b982 100644 --- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java +++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java @@ -28,7 +28,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java index 6894fe5bef2f9..df303daa4ab3c 100644 --- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java +++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java @@ -28,7 +28,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-langchain4j-web-search/pom.xml b/components/camel-ai/camel-langchain4j-web-search/pom.xml index 9dd0a3468e025..38ca28d39bda5 100644 --- a/components/camel-ai/camel-langchain4j-web-search/pom.xml +++ b/components/camel-ai/camel-langchain4j-web-search/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java index c4dfb9b4d1e36..8f80a252668cd 100644 --- a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java +++ b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java @@ -23,7 +23,7 @@ import dev.langchain4j.web.search.google.customsearch.GoogleCustomWebSearchEngine; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java index 4bee0b062c909..a8a24d3dfe72c 100644 --- a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java +++ b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java @@ -24,7 +24,7 @@ import dev.langchain4j.web.search.tavily.TavilyWebSearchEngine; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/components/camel-ai/camel-milvus/pom.xml b/components/camel-ai/camel-milvus/pom.xml index 3c2fab505f544..6d94dd508da6e 100644 --- a/components/camel-ai/camel-milvus/pom.xml +++ b/components/camel-ai/camel-milvus/pom.xml @@ -109,7 +109,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java index e6ad879f4e246..36903bad63615 100644 --- a/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java +++ b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.milvus.services.MilvusService; import org.apache.camel.test.infra.milvus.services.MilvusServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-neo4j/pom.xml b/components/camel-ai/camel-neo4j/pom.xml index 5a66f325227c2..be90d49cc7105 100644 --- a/components/camel-ai/camel-neo4j/pom.xml +++ b/components/camel-ai/camel-neo4j/pom.xml @@ -63,7 +63,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java index 6b0d6eae5e88e..e1e4354b73b17 100644 --- a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java +++ b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.neo4j.services.Neo4jService; import org.apache.camel.test.infra.neo4j.services.Neo4jServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-openai/pom.xml b/components/camel-ai/camel-openai/pom.xml index 6af7b3c3446ee..ba7e635af8e22 100644 --- a/components/camel-ai/camel-openai/pom.xml +++ b/components/camel-ai/camel-openai/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java index b337388f8cc15..6d2810e5bf901 100644 --- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java +++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java index 3dc7822c3376d..671c63b5f0586 100644 --- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java +++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.openai.mock.OpenAIMock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java index ee8e2f69c9a91..2f7a84847db2a 100644 --- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java +++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.openai.OpenAIConstants; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAITestSupport.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAITestSupport.java index a27db639b9eef..8d274a9fff464 100644 --- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAITestSupport.java +++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAITestSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.component.openai.OpenAIComponent; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-pinecone/pom.xml b/components/camel-ai/camel-pinecone/pom.xml index f25e4597b04dc..393092ab2583c 100644 --- a/components/camel-ai/camel-pinecone/pom.xml +++ b/components/camel-ai/camel-pinecone/pom.xml @@ -74,7 +74,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java index 55c4fc938c708..1b129c7b2762e 100644 --- a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java +++ b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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; diff --git a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java index c7cd88d3d3279..200195c429beb 100644 --- a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java +++ b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.pinecone.services.PineconeService; import org.apache.camel.test.infra.pinecone.services.PineconeServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java index 9280717e33122..a33e83f607b52 100644 --- a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java +++ b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.pinecone.PineconeVectorDbAction; import org.apache.camel.component.pinecone.PineconeVectorDbHeaders; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.*; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ai/camel-qdrant/pom.xml b/components/camel-ai/camel-qdrant/pom.xml index 4ab417e3ea3e1..879899a2272b0 100644 --- a/components/camel-ai/camel-qdrant/pom.xml +++ b/components/camel-ai/camel-qdrant/pom.xml @@ -112,7 +112,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java index 916e8953c2f13..d7938b0a34821 100644 --- a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java +++ b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.InvalidPayloadException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java index 2ca5775ae0800..689a50e65d4f6 100644 --- a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java +++ b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.qdrant.services.QdrantService; import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-ai/camel-tensorflow-serving/pom.xml b/components/camel-ai/camel-tensorflow-serving/pom.xml index c106c94e12d93..96eee1aa1d3c0 100644 --- a/components/camel-ai/camel-tensorflow-serving/pom.xml +++ b/components/camel-ai/camel-tensorflow-serving/pom.xml @@ -78,7 +78,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java b/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java index e92a6be7c8fc0..c7dc00c0da97a 100644 --- a/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java +++ b/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.component.tensorflow.serving.TensorFlowServingComponent; import org.apache.camel.test.infra.tensorflow.serving.services.TensorFlowServingService; import org.apache.camel.test.infra.tensorflow.serving.services.TensorFlowServingServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; class TensorFlowServingITSupport extends CamelTestSupport { diff --git a/components/camel-ai/camel-torchserve/pom.xml b/components/camel-ai/camel-torchserve/pom.xml index 5cfd4cdf26d4d..3956caca1a593 100644 --- a/components/camel-ai/camel-torchserve/pom.xml +++ b/components/camel-ai/camel-torchserve/pom.xml @@ -94,7 +94,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java index 5b9ea09735164..a4bdbff73fc2b 100644 --- a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java +++ b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.component.torchserve; import com.github.tomakehurst.wiremock.WireMockServer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java index d183cdcc2a9c3..cc3682c91c2e7 100644 --- a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java +++ b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.component.torchserve.TorchServeComponent; import org.apache.camel.test.infra.torchserve.services.TorchServeService; import org.apache.camel.test.infra.torchserve.services.TorchServeServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; class TorchServeITSupport extends CamelTestSupport { diff --git a/components/camel-ai/camel-weaviate/pom.xml b/components/camel-ai/camel-weaviate/pom.xml index 8daeef63f7491..88c6e90f61973 100644 --- a/components/camel-ai/camel-weaviate/pom.xml +++ b/components/camel-ai/camel-weaviate/pom.xml @@ -70,7 +70,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java index fccb324a5d6e8..0520eadc0b461 100644 --- a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java +++ b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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; diff --git a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java index a9fefd01c2918..b393158defc73 100644 --- a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java +++ b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.weaviate.services.WeaviateService; import org.apache.camel.test.infra.weaviate.services.WeaviateServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml index ed13a659fc03f..2af03dc0e96c1 100644 --- a/components/camel-amqp/pom.xml +++ b/components/camel-amqp/pom.xml @@ -99,7 +99,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java index 53503633820c5..ba556ef25be6c 100644 --- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java +++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java @@ -23,16 +23,11 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.infra.artemis.services.ArtemisService; -import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.infra.core.CamelContextExtension; -import org.apache.camel.test.infra.core.DefaultCamelContextExtension; import org.apache.camel.test.infra.core.annotations.ContextFixture; import org.apache.camel.test.infra.core.annotations.RouteFixture; import org.apache.qpid.jms.JmsConnectionFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent; import static org.apache.camel.component.amqp.AMQPConnectionDetails.discoverAMQP; @@ -40,12 +35,6 @@ public class AMQPRouteTraceFrameTest extends AMQPTestSupport { - @RegisterExtension - protected static ArtemisService service = ArtemisServiceFactory.createSingletonAMQPService(); - - @RegisterExtension - protected static CamelContextExtension contextExtension = new DefaultCamelContextExtension(); - private MockEndpoint resultEndpoint; private final String expectedBody = "Hello there!"; diff --git a/components/camel-arangodb/pom.xml b/components/camel-arangodb/pom.xml index 4fd45daa5fcef..83571b1e096e9 100644 --- a/components/camel-arangodb/pom.xml +++ b/components/camel-arangodb/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml index 02c1343d07a8a..2d2807ec9880a 100644 --- a/components/camel-as2/camel-as2-api/pom.xml +++ b/components/camel-as2/camel-as2-api/pom.xml @@ -83,7 +83,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml index cb1a18179f9e0..70941ad14febd 100644 --- a/components/camel-as2/camel-as2-component/pom.xml +++ b/components/camel-as2/camel-as2-component/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java index 67b5bedcf1235..d17be055f201d 100644 --- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java +++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java @@ -23,8 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; /** * Abstract base class for AS2 Integration tests generated by Camel API component maven plugin. diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java index b3fd0bb1e801c..e9438f0a8dcc0 100644 --- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java +++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.as2.api.AS2SignatureAlgorithm; import org.apache.camel.component.as2.internal.AS2ApiName; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml index 35ff958bf7417..cec3e87197467 100644 --- a/components/camel-asn1/pom.xml +++ b/components/camel-asn1/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -63,7 +63,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java index 25b4e25f6848c..602d70c1fe325 100644 --- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java +++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java @@ -25,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.FileUtils; import org.bouncycastle.asn1.ASN1Primitive; import org.junit.jupiter.api.Test; diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java index f2faf9da8f449..55b0b37b4f4f6 100644 --- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java +++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java index 0c11cff2ad608..033fd3e9296f1 100644 --- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java +++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java index 450885322c496..d10d0ffa96190 100644 --- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java +++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml index 5ce1916183cb5..56bb1246cec78 100644 --- a/components/camel-asterisk/pom.xml +++ b/components/camel-asterisk/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java index 5d616aae084b5..f3cf77c45e766 100644 --- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java +++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.asterisk; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java index 2b9ff1647938d..e1221e7047a48 100644 --- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java +++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java index ce263255f757e..717cf0dca6e2d 100644 --- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java +++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index ee40caa8c6ca8..65265658d45f3 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java index a54e4fcac1f43..ab94dca517f2f 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.test.infra.jetty.services.JettyConfiguration; import org.apache.camel.test.infra.jetty.services.JettyConfigurationBuilder; import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java index ff905693dc3b9..0e6670cbe0ce9 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.test.infra.jetty.services.JettyConfiguration; import org.apache.camel.test.infra.jetty.services.JettyConfigurationBuilder; import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml index 4811afb7d7b77..bde9e4868b13a 100644 --- a/components/camel-atom/pom.xml +++ b/components/camel-atom/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java index 25c24046be773..ce868c634b0fc 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java index 20a187b1a0abc..31ed956d3e940 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java index e9618d4ff51b6..1c4f5e11d2a71 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.atom; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java index 032d6fd49d2a5..80f9a28a0c6ef 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java index de15bc1adb76f..505e3812fb673 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java index e12b6cbf765d8..774c57c05b78a 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java index 6d557404575c8..4dd629bf969d8 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java index 164e3b3be276d..9fd59d699e437 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/components/camel-attachments/pom.xml b/components/camel-attachments/pom.xml index 46445f69969d2..a5f3c3c9d6d7b 100644 --- a/components/camel-attachments/pom.xml +++ b/components/camel-attachments/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java index 08a9bb8a86fa8..8ea6cbb785dfd 100644 --- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java +++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java index ac4e285902be3..69f8a88196445 100644 --- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java +++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java index 780d0963c3bd2..fac661072d083 100644 --- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java +++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java @@ -24,7 +24,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java index 65fbd740989ce..4cfe17bf572cc 100644 --- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java +++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java index cda4c68f0392e..db593f65e9607 100644 --- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java +++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.ExchangeBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java index fe746aa3eceb8..12c5643d1019b 100644 --- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java +++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java @@ -21,7 +21,7 @@ import jakarta.activation.DataHandler; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java index 6d0aa8f18bd31..cfade768f0866 100644 --- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java +++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java @@ -27,7 +27,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml index 78f1e8b62ba53..33f6bab3b6857 100644 --- a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml +++ b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java index cc8f7cb2dec3e..9ea12f3845f2e 100644 --- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java +++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java @@ -27,7 +27,7 @@ import org.apache.camel.avro.test.TestPojo; import org.apache.camel.avro.test.TestReflection; import org.apache.camel.avro.test.TestReflectionImpl; -import org.apache.camel.test.junit5.TestNameExtension; +import org.apache.camel.test.junit6.TestNameExtension; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java index c08490fb2099e..7b36c6941b4d1 100644 --- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java +++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java @@ -24,7 +24,7 @@ import org.apache.camel.avro.impl.KeyValueProtocolImpl; import org.apache.camel.avro.test.TestReflectionImpl; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestNameExtension; +import org.apache.camel.test.junit6.TestNameExtension; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java index da53160f9d10a..89eb4e9698f70 100644 --- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java +++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class AvroTestSupport extends CamelTestSupport { protected int port = 9100; diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml index eb4b3bbbb081d..efe41b741df52 100644 --- a/components/camel-avro/pom.xml +++ b/components/camel-avro/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java index 626553ba9020f..8ac60a94cee35 100644 --- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java +++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java @@ -26,7 +26,7 @@ import org.apache.avro.generic.GenericRecord; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java index 3ce376faedd9a..d69c8b09c8fe1 100644 --- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java +++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.avro.example.DateRecord; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java index cff3db9f00b0d..eaf2ef384feb6 100644 --- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java +++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java @@ -24,7 +24,7 @@ import org.apache.avro.generic.GenericRecord; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java index 8bf1ae160d142..2aa50f5ea0718 100644 --- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java +++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.avro.example.Value; import org.apache.camel.model.dataformat.AvroLibrary; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws-bedrock/pom.xml b/components/camel-aws/camel-aws-bedrock/pom.xml index e13fcfb9d270c..102f0e8788e50 100644 --- a/components/camel-aws/camel-aws-bedrock/pom.xml +++ b/components/camel-aws/camel-aws-bedrock/pom.xml @@ -82,7 +82,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java index 7dc61da9c6077..c4e070ea26955 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java @@ -19,7 +19,7 @@ import org.apache.camel.*; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java index 8d04c59668b98..7406265282c60 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java index ad3ff441d05c9..ee226d6de60e8 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.bedrock.BedrockModels; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java index 9297bf393e31c..0d164fa02b1a9 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.aws2.bedrock.BedrockModels; import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java index 6455c673a2b8a..a6e33f8f4308a 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.aws2.bedrock.BedrockModels; import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java index 62e189dbe5b8b..72dfedfa05d3b 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java @@ -31,7 +31,7 @@ import org.apache.camel.component.aws2.bedrock.BedrockModels; import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml b/components/camel-aws/camel-aws-cloudtrail/pom.xml index edb826e5b8668..610409dc15aab 100644 --- a/components/camel-aws/camel-aws-cloudtrail/pom.xml +++ b/components/camel-aws/camel-aws-cloudtrail/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws-config/pom.xml b/components/camel-aws/camel-aws-config/pom.xml index d183d9448ef49..00b8fd9a57878 100644 --- a/components/camel-aws/camel-aws-config/pom.xml +++ b/components/camel-aws/camel-aws-config/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java index c69492f91beac..11639a80f3f18 100644 --- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java index af67f1127e785..38003c8ac56cd 100644 --- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java index ab80acb58983d..989391f0bc33f 100644 --- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java +++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java index a7e8237a65f55..95d01dccbbb8d 100644 --- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java +++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws.config.AWSConfigConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws-parameter-store/pom.xml b/components/camel-aws/camel-aws-parameter-store/pom.xml index ca5e91d93cbc2..6baaea7b222d5 100644 --- a/components/camel-aws/camel-aws-parameter-store/pom.xml +++ b/components/camel-aws/camel-aws-parameter-store/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java index 8c34e97717afd..7558d1b488468 100644 --- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws.parameterstore; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java index aa17e481d67d3..8c46ac50f01b2 100644 --- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java index 657347ab65910..4098f947e39e8 100644 --- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java +++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java @@ -23,7 +23,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java index 2fad4dafa03f1..f977286adc32b 100644 --- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java +++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java @@ -19,7 +19,7 @@ import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml index 3b594abb6da96..225d3683a4214 100644 --- a/components/camel-aws/camel-aws-secrets-manager/pom.xml +++ b/components/camel-aws/camel-aws-secrets-manager/pom.xml @@ -87,7 +87,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java index 515123d3f11ab..1a004b14e2cb6 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws.secretsmanager; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java index 306c65b071d50..737e00f397ae3 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java index 6580a833d2c8f..9e00040bacd0a 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java index 9effb4574909e..2d62ec6b0e1ba 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java @@ -23,7 +23,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java index 75841c2845d5e..86955a3ac403d 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java @@ -19,7 +19,7 @@ import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws-security-hub/pom.xml b/components/camel-aws/camel-aws-security-hub/pom.xml index 547c3d8486eca..860fbd98b8d14 100644 --- a/components/camel-aws/camel-aws-security-hub/pom.xml +++ b/components/camel-aws/camel-aws-security-hub/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java index d84f66b51a904..f6b3ea0706eea 100644 --- a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws.securityhub; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java index 464775cd156c0..82aabd3ffaa87 100644 --- a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java +++ b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws.securityhub.SecurityHubConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws-xray/pom.xml b/components/camel-aws/camel-aws-xray/pom.xml index 7274f0db67e20..8103cd1ba5d15 100644 --- a/components/camel-aws/camel-aws-xray/pom.xml +++ b/components/camel-aws/camel-aws-xray/pom.xml @@ -105,7 +105,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test 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 dfe1bcba4d326..459afcaf7ea3d 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 @@ -27,7 +27,7 @@ import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.InterceptStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java index e1be764de75fc..9b66c4816145f 100644 --- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java +++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-aws/camel-aws2-athena/pom.xml b/components/camel-aws/camel-aws2-athena/pom.xml index a28bb884957bd..aa8a3d1fe360b 100644 --- a/components/camel-aws/camel-aws2-athena/pom.xml +++ b/components/camel-aws/camel-aws2-athena/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java index ad85756657138..6d00ab4ae72f3 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java index b8bfe2a0465bc..ffc356b13f3b3 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java index 5ed6bd357397b..b03995062b9ee 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java index d55fe0dda83ad..581c10d4f1449 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.athena; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java index ba1a10285c96a..607940b30ba35 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.athena; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java index 6e05941362d53..05c72da64072d 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java @@ -31,7 +31,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.athena.model.GetQueryExecutionResponse; import software.amazon.awssdk.services.athena.model.GetQueryResultsResponse; diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java index 21ccc4b0584fd..3c69a6d2cbed6 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.athena.Athena2Constants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-comprehend/pom.xml b/components/camel-aws/camel-aws2-comprehend/pom.xml index 6f828ac5f559c..35bf3d049e730 100644 --- a/components/camel-aws/camel-aws2-comprehend/pom.xml +++ b/components/camel-aws/camel-aws2-comprehend/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java index d19963a4b7d5c..85918b65c5576 100644 --- a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java +++ b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java @@ -24,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.comprehend.model.DetectDominantLanguageRequest; import software.amazon.awssdk.services.comprehend.model.DetectSentimentRequest; diff --git a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java index 674bcc8dccbbe..06ea55c00afc1 100644 --- a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java +++ b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.aws2.comprehend.Comprehend2Constants; import org.apache.camel.component.aws2.comprehend.Comprehend2Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import software.amazon.awssdk.services.comprehend.model.DetectSentimentResponse; diff --git a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java index db426bc147250..3e8fc7150abc4 100644 --- a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java +++ b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.aws2.comprehend.Comprehend2Constants; import org.apache.camel.component.aws2.comprehend.Comprehend2Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-cw/pom.xml b/components/camel-aws/camel-aws2-cw/pom.xml index b3f990c87ec3a..d7d6645af6198 100644 --- a/components/camel-aws/camel-aws2-cw/pom.xml +++ b/components/camel-aws/camel-aws2-cw/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java index 9ea0d78c2635e..c8fefbf46e4b6 100644 --- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java @@ -19,7 +19,7 @@ import java.time.Instant; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java index aac44d55926c9..78bfc2ea2dd5c 100644 --- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java +++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java @@ -19,7 +19,7 @@ import java.time.Instant; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java index cb88f65855172..0c6b9b3812e6d 100644 --- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java +++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; import software.amazon.awssdk.services.cloudwatch.model.DescribeAlarmsForMetricResponse; diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java index a03c85488878c..6fd6892380431 100644 --- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java +++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml b/components/camel-aws/camel-aws2-ddb/pom.xml index 7da608cfdd058..b8822884ad27a 100644 --- a/components/camel-aws/camel-aws2-ddb/pom.xml +++ b/components/camel-aws/camel-aws2-ddb/pom.xml @@ -91,7 +91,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java index acf8ea816b162..1ba2516570e2b 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java index 22d4632721aa7..2214589e9caf4 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java index 36c8e9fa00cc5..57d90520efc63 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.ddb; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java index 1121c82a738f4..d49a3f08ea0a3 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.ddb; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java index cd581f61921bd..b51cf4a395b2d 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; import software.amazon.awssdk.services.dynamodb.DynamoDbClient; diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java index cae406de7db09..b9223b6d7a73a 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java @@ -28,7 +28,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry; import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java index 142a2cb692d99..70353a83397d5 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.ddbstream; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java index 4244ee23b33d3..d9451d5824381 100644 --- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java +++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.StreamIteratorType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-ec2/pom.xml b/components/camel-aws/camel-aws2-ec2/pom.xml index 31b5f97fa3a7b..44b8ebba7d3ab 100644 --- a/components/camel-aws/camel-aws2-ec2/pom.xml +++ b/components/camel-aws/camel-aws2-ec2/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java index 2f33064e81166..bc38e9d28cd74 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java index 51b4ae5866b6a..aca68726e64e5 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java index f68528733c5d4..2828cddc02993 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.ec2; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java index c27798aef9e18..bf94bbadb1a95 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.aws2.ec2; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java index 7b201c303b9aa..d5c6967789576 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java index 0d7ec2a3e42a8..7a124e29f7f91 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.ec2.model.DescribeInstanceStatusResponse; import software.amazon.awssdk.services.ec2.model.DescribeInstancesResponse; diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java index 7b23819b4043d..06440a30c1d4f 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java index 2a275a93f2332..287bb3072bd3f 100644 --- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java +++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.ec2.AWS2EC2Constants; import org.apache.camel.component.aws2.ec2.AWS2EC2Operations; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-ecs/pom.xml b/components/camel-aws/camel-aws2-ecs/pom.xml index c0e1445ca504e..861a570db5f77 100644 --- a/components/camel-aws/camel-aws2-ecs/pom.xml +++ b/components/camel-aws/camel-aws2-ecs/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java index dfabc398526d8..ebd58f4f74089 100644 --- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.ecs; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java index 9cd655acaffb0..40f3f3bbe31cb 100644 --- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.ecs; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java index f066b30cc35e5..a41b65c8ee577 100644 --- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java index 94617d3877b41..dc7d248c6330c 100644 --- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java index 601e8dccb6476..7e0fb9f61b932 100644 --- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.ecs.model.CreateClusterResponse; diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java index 7124df07facd6..53c44566b3564 100644 --- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java +++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.ecs.model.CreateClusterResponse; import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse; diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java index bb0ce88150027..bc402a4afb2a2 100644 --- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java +++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-eks/pom.xml b/components/camel-aws/camel-aws2-eks/pom.xml index 929e46afa6033..d05c79684498a 100644 --- a/components/camel-aws/camel-aws2-eks/pom.xml +++ b/components/camel-aws/camel-aws2-eks/pom.xml @@ -68,7 +68,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java index 924ed13cc2eae..80066a2eaaafc 100644 --- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.eks; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java index da67972ae7f07..652cdeab9646a 100644 --- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.eks; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java index 55d174e109024..1e2b632c086f9 100644 --- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java index e082ccc111d8a..58286ae7555dc 100644 --- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java index be3dd4d80cf05..1ffe753973791 100644 --- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.eks.model.CreateClusterResponse; diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java index 6e781b5603706..e23b91e9ad7ca 100644 --- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java +++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.eks.model.CreateClusterResponse; import software.amazon.awssdk.services.eks.model.DeleteClusterResponse; diff --git a/components/camel-aws/camel-aws2-eventbridge/pom.xml b/components/camel-aws/camel-aws2-eventbridge/pom.xml index 1f21a9998d48e..cbe21c7e51702 100644 --- a/components/camel-aws/camel-aws2-eventbridge/pom.xml +++ b/components/camel-aws/camel-aws2-eventbridge/pom.xml @@ -72,7 +72,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java index fff58a7e53fb2..1f9de8fd4dfbe 100644 --- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.eventbridge; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java index 0ad7512e2eba5..ce4f15b0d134d 100644 --- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java index 7c185b6b7dd58..9d44dde93b5b1 100644 --- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java index 513021a60cfa9..98dc40cbf81bd 100644 --- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java +++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.eventbridge.EventbridgeConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java index 96a63ec16961b..69d18dc26a511 100644 --- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java +++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.eventbridge.EventbridgeConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java index 19747aeed42cc..8e19e2ca52e48 100644 --- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java +++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java index 364725e5c8672..c9897b5deb1d8 100644 --- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java +++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java @@ -28,7 +28,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-iam/pom.xml b/components/camel-aws/camel-aws2-iam/pom.xml index 8f5be07ffcca3..62a8652b177b7 100644 --- a/components/camel-aws/camel-aws2-iam/pom.xml +++ b/components/camel-aws/camel-aws2-iam/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java index feb74dd551651..65f0e99c1a397 100644 --- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java index c2ecdfee5934f..f5e28617b2deb 100644 --- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java index 85efb36d18199..a63fa5c483b23 100644 --- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.iam; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java index ecc907a69a634..629717aaab3a4 100644 --- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.iam; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java index abcb061972bd9..2a68c9bbcf9a2 100644 --- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.iam.model.AddUserToGroupResponse; diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java index 8d059d0b981fb..cc2bea26b1926 100644 --- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java +++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.iam.model.AddRoleToInstanceProfileResponse; import software.amazon.awssdk.services.iam.model.AddUserToGroupResponse; diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java index ca918320fd98e..3395a60a1399f 100644 --- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java +++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-kinesis/pom.xml b/components/camel-aws/camel-aws2-kinesis/pom.xml index 216aa43bf4c23..b268b186ef851 100644 --- a/components/camel-aws/camel-aws2-kinesis/pom.xml +++ b/components/camel-aws/camel-aws2-kinesis/pom.xml @@ -90,7 +90,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java index 3268ef5ee96bf..7c093446adb39 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.firehose; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java index b851b17c695d8..1096104c2c121 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java @@ -26,7 +26,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.firehose.KinesisFirehose2Constants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java index 49b1a90fc642d..0d082b6dee6c6 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java @@ -29,7 +29,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java index 1b223c8762b49..250aac90953b7 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java @@ -29,7 +29,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java index 948ff3b4902be..2a0d7c84f9080 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java @@ -29,7 +29,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java index 9a180b53b78f6..d28fabe69fc92 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.kinesis; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java index 61816ed57594a..002fdf1dec694 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.kinesis.Kinesis2Constants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.testcontainers.shaded.org.awaitility.Awaitility; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java index 34ca9cd81592a..1fb155b3dc88d 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java @@ -31,7 +31,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.apache.camel.test.infra.common.TestUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java index d8352c63e4784..1e4da5ba2de8d 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java @@ -35,7 +35,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.apache.camel.test.infra.common.TestUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java index 8b3030175711d..7ca2d4cf89702 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java +++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java @@ -33,7 +33,7 @@ import org.apache.camel.test.infra.aws2.clients.KinesisUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.apache.camel.test.infra.common.TestUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml index baed4226d1439..4221e7fe7f6c0 100644 --- a/components/camel-aws/camel-aws2-kms/pom.xml +++ b/components/camel-aws/camel-aws2-kms/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java index ad72218fd41d4..9cbe45be5f092 100644 --- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.kms; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java index 4df3d1d0bdc44..5897f316a04e4 100644 --- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.kms; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java index 969b644a9adfc..d090eb59a9b45 100644 --- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.kms.model.CreateKeyResponse; diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java index 9aa898470d2c6..5c43ae2ad81d8 100644 --- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java +++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.kms.model.CreateKeyResponse; import software.amazon.awssdk.services.kms.model.DescribeKeyResponse; diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java index f47a39a86fef4..9418579b4c1d5 100644 --- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java +++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-lambda/pom.xml b/components/camel-aws/camel-aws2-lambda/pom.xml index 671a68084c684..01ac3b43dfd2d 100644 --- a/components/camel-aws/camel-aws2-lambda/pom.xml +++ b/components/camel-aws/camel-aws2-lambda/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java index 34f3767f6af97..6e997d9257a82 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java index 978f042564462..459e034c3648e 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java index 0c1d75472915a..fcfeb0ae7c5ad 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.aws2.lambda; import org.apache.camel.PropertyBindingException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.lambda.LambdaClient; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java index 179a1034492a3..b0c761861a2d5 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.aws2.lambda; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java index b21e53df7d8a7..7b1537690a2b0 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java index a2d20d10c80a8..edf5926dd0f7f 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java index 5e086d3a9fb16..b76baa592d88b 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java @@ -30,7 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.lambda.model.AddPermissionResponse; import software.amazon.awssdk.services.lambda.model.CreateAliasResponse; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java index ba7efe2779a20..8721f902c7674 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java index df6850a8b44d1..c7d6b895933f8 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java @@ -20,7 +20,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-mq/pom.xml b/components/camel-aws/camel-aws2-mq/pom.xml index 7473f26aa7493..10962e5f8d63c 100644 --- a/components/camel-aws/camel-aws2-mq/pom.xml +++ b/components/camel-aws/camel-aws2-mq/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java index b84e23f3f95e5..1f238563ceb75 100644 --- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java index ba7c13638f676..bb5a0d878a3f9 100644 --- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java index 5fc8570d2d53a..58af9f301c4f7 100644 --- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.mq; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java index 58f40d9623703..43f2d8edc5d59 100644 --- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.mq; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java index b424a31f2e57f..fcd60dc23c263 100644 --- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.mq.model.BrokerState; diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java index 6d5055d5b7eef..091eb9fe7c207 100644 --- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java +++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.mq.model.BrokerState; import software.amazon.awssdk.services.mq.model.ConfigurationId; diff --git a/components/camel-aws/camel-aws2-msk/pom.xml b/components/camel-aws/camel-aws2-msk/pom.xml index 6fef974e559ef..a23a3c632b268 100644 --- a/components/camel-aws/camel-aws2-msk/pom.xml +++ b/components/camel-aws/camel-aws2-msk/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java index 2c10e899d72ea..f3f9b7b7d4ab2 100644 --- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java index 1ba38087ceffc..69b76f6066e75 100644 --- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java index 9215c947319eb..5b8cf5783e54a 100644 --- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.msk; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java index fe841e21de13a..e020114572a04 100644 --- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.msk; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java index 023bb37455d6d..818f2e247f1d5 100644 --- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.kafka.model.BrokerNodeGroupInfo; diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java index 678c397ee9c19..3e9b1b4b8021f 100644 --- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java +++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.kafka.model.BrokerNodeGroupInfo; import software.amazon.awssdk.services.kafka.model.ClusterState; diff --git a/components/camel-aws/camel-aws2-polly/pom.xml b/components/camel-aws/camel-aws2-polly/pom.xml index 961fb42357d6d..ca1da691e3d7f 100644 --- a/components/camel-aws/camel-aws2-polly/pom.xml +++ b/components/camel-aws/camel-aws2-polly/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java index 006b2283bbe9a..6373b43c8efc6 100644 --- a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java +++ b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.polly.model.Lexicon; import software.amazon.awssdk.services.polly.model.LexiconDescription; diff --git a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java index 94f539536e3e0..262f46b00240a 100644 --- a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java +++ b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.polly.Polly2Constants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java index dded392b70a48..e712c82067b7d 100644 --- a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java +++ b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java @@ -23,7 +23,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-redshift/pom.xml b/components/camel-aws/camel-aws2-redshift/pom.xml index 133bd051fe569..98f6aeb5ca73d 100644 --- a/components/camel-aws/camel-aws2-redshift/pom.xml +++ b/components/camel-aws/camel-aws2-redshift/pom.xml @@ -71,7 +71,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java index 42467b40bc1de..f5f028150daab 100644 --- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.redshift.data; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java index eede17174a7ae..690281ae482a5 100644 --- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.redshift.data; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java index 01ae2d7f1b2b8..7c301d080daaa 100644 --- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.redshiftdata.model.BatchExecuteStatementResponse; diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java index c3a2f2984e5fc..944c95cf438e7 100644 --- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java +++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.redshiftdata.model.BatchExecuteStatementResponse; import software.amazon.awssdk.services.redshiftdata.model.CancelStatementResponse; diff --git a/components/camel-aws/camel-aws2-rekognition/pom.xml b/components/camel-aws/camel-aws2-rekognition/pom.xml index 2bceef5d72a91..916610bd80b2c 100644 --- a/components/camel-aws/camel-aws2-rekognition/pom.xml +++ b/components/camel-aws/camel-aws2-rekognition/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java index c5500b15c37ba..b862c6fe7c71e 100644 --- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.rekognition; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java index 1fae4336b4f49..2f0c61e2307d0 100644 --- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.rekognition; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java index e2c4d76d042b9..3d579060983fa 100644 --- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java index a0e62b28325c9..ae741ad32e0cb 100644 --- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java index 5da9f6c1f3a95..b8e648e4362d3 100644 --- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.rekognition.model.AssociateFacesResponse; diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java index cc5734cc2c5dd..8b2eff105565f 100644 --- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java +++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.rekognition.model.*; diff --git a/components/camel-aws/camel-aws2-s3-vectors/pom.xml b/components/camel-aws/camel-aws2-s3-vectors/pom.xml index 83c03fe172dba..695d2416d17da 100644 --- a/components/camel-aws/camel-aws2-s3-vectors/pom.xml +++ b/components/camel-aws/camel-aws2-s3-vectors/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java b/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java index 4ecb4a45b0b55..22cc295234dce 100644 --- a/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java +++ b/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java @@ -32,7 +32,7 @@ import org.apache.camel.component.aws2.s3vectors.AWS2S3VectorsEndpoint; import org.apache.camel.component.aws2.s3vectors.AWS2S3VectorsOperations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; diff --git a/components/camel-aws/camel-aws2-s3/pom.xml b/components/camel-aws/camel-aws2-s3/pom.xml index df2daf5bfbd7d..f40f9db8a2ccd 100644 --- a/components/camel-aws/camel-aws2-s3/pom.xml +++ b/components/camel-aws/camel-aws2-s3/pom.xml @@ -72,7 +72,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java index a70fd003951d7..70430c8a10b02 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java @@ -29,7 +29,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java index 44d8130626367..3f2db22bfc2c6 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java @@ -28,7 +28,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java index dfd8853cab417..4763575a7f2bd 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.s3; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java index 4d8fd90a94222..ea4960277f427 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java @@ -26,7 +26,7 @@ import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.apache.camel.test.infra.common.SharedNameGenerator; import org.apache.camel.test.infra.common.TestEntityNameGenerator; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; import software.amazon.awssdk.services.kms.model.CreateKeyRequest; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java index 67939edfc99ee..ff69a951aa95c 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.s3.AWS2S3Constants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java index 5c6bf2bb6450d..08809e8d8b45f 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java @@ -31,7 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.s3.AWS2S3Constants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java index eabd9e7b0a8c8..0916babf6b7e1 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.aws2.s3.AWS2S3Constants; import org.apache.camel.component.aws2.s3.AWS2S3Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java index 85609b918a845..7972668bd0847 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java @@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.s3.AWS2S3Constants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java index 606e43e9ad60c..feb01f0039177 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.s3.AWS2S3Constants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java index 4c8912a90dfc7..b28589411cecb 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.s3.AWS2S3Configuration; import org.apache.camel.component.aws2.s3.AWS2S3Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-aws/camel-aws2-ses/pom.xml b/components/camel-aws/camel-aws2-ses/pom.xml index c67a9d8b15ccb..d75aeba4390aa 100644 --- a/components/camel-aws/camel-aws2-ses/pom.xml +++ b/components/camel-aws/camel-aws2-ses/pom.xml @@ -81,7 +81,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java index 80e1141f30af0..8434efb84292c 100644 --- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.ses; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java index 9b1d525077045..acb9c79fb5bde 100644 --- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java index 90aa68c5c5081..a979a2ef63cf9 100644 --- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java index 20e0a51ff8d3e..07578739af43a 100644 --- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.aws2.ses; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java index 91e74090c4bb5..aeb442a5a15f9 100644 --- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java +++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java index 936963872e9f5..1ba9aa3de35a9 100644 --- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java +++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.ses.model.MessageTag; import software.amazon.awssdk.services.ses.model.SendEmailRequest; diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java index 4c9eb9315857b..b9c6ac26b8e53 100644 --- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java +++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.ses.Ses2Constants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-sns/pom.xml b/components/camel-aws/camel-aws2-sns/pom.xml index de373b3d11544..5d45af42dde10 100644 --- a/components/camel-aws/camel-aws2-sns/pom.xml +++ b/components/camel-aws/camel-aws2-sns/pom.xml @@ -88,7 +88,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java index 77db7e15f4025..95b645148d373 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.sns; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java index a4ddf26a53ff5..e1a3d9539d95e 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java index fdba56104bbe8..de3939de59385 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java index e910c4478e7cd..325a235e47417 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.aws2.sns; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java index 03fcfb13d981c..446e44527c0b5 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java index a70ec46279bda..e3182d2d61c94 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java index f28065c26d72c..f62726fe68ae8 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java index 07a7b355a810c..12bf6ff1f864c 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.sns.Sns2Constants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java index ec833bb7cdee6..faf5568128e09 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.sns.Sns2Constants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java index 2b8a3a25cb85d..e678527133851 100644 --- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java +++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.sns.Sns2Constants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-aws/camel-aws2-sqs/pom.xml b/components/camel-aws/camel-aws2-sqs/pom.xml index 2b5e213510689..ad057b8c03bc5 100644 --- a/components/camel-aws/camel-aws2-sqs/pom.xml +++ b/components/camel-aws/camel-aws2-sqs/pom.xml @@ -82,7 +82,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java index 4f2b82b7688d5..d0edddc3c5756 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java @@ -28,7 +28,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java index 3e38cee45bb6b..6e684f409930c 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java @@ -28,7 +28,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java index 84cd5c7436448..c1e14843ff7a6 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java @@ -28,7 +28,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java index 4f6df74ebb78f..184cdd0511916 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.clock.EventClock; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java index 11f2d87f7141d..13dc7e0babac3 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java @@ -22,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.Message; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java index e3be30285ee32..d29c94f316a7d 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.Message; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java index f53522eeab0a6..880a85d6a863d 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.sqs; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java index 9f957278b5d4c..e0c2a2841eb2f 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.aws2.sqs; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java index cf92e186344ee..6e4dc0438e0e2 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java index 58edc046396e8..7567d839c06c2 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java index 8c105dd7adc19..e8222944ff412 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.Message; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java index 900b8789c2f41..6614f132ad4fd 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java index 9c15a26821885..9c83c97169738 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.Message; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java index 24ac05198e78d..3f5375ccd978c 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java index ae821b9e016f2..ce6d70a71354d 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java index 3b91867758a4a..38fbac214c421 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.DeleteQueueResponse; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java index cc386fe1eed65..9cf1dc04698e1 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java index b4d6f6eeeff33..9e8c8f539b0ff 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.ListQueuesResponse; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java index 887c24ca31a87..c657f1f0718c7 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sqs.model.PurgeQueueResponse; diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java index 5ce1eb17d93ba..f15c2eea27ca7 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java @@ -23,7 +23,7 @@ import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.apache.camel.test.infra.common.SharedNameGenerator; import org.apache.camel.test.infra.common.TestEntityNameGenerator; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-step-functions/pom.xml b/components/camel-aws/camel-aws2-step-functions/pom.xml index 5dcc7889f17a4..b4babeba83a41 100644 --- a/components/camel-aws/camel-aws2-step-functions/pom.xml +++ b/components/camel-aws/camel-aws2-step-functions/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java index f6ab0441304f7..594af1959c460 100644 --- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.stepfunctions; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java index b337654b271d5..6c7335f9bdadb 100644 --- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.stepfunctions; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java index ff3f2ccfbfe00..d68c57efefb68 100644 --- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java index 32722556e0c9f..64eca3ba6610a 100644 --- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java index 2fc21c8997995..485426db0397d 100644 --- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.sfn.model.*; diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java index 4e2872568935a..ea6652cb9b6ec 100644 --- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java +++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java @@ -24,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sfn.model.*; diff --git a/components/camel-aws/camel-aws2-sts/pom.xml b/components/camel-aws/camel-aws2-sts/pom.xml index 041a05972dce6..80e959a8e1238 100644 --- a/components/camel-aws/camel-aws2-sts/pom.xml +++ b/components/camel-aws/camel-aws2-sts/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java index d807266d34b10..a0b935761a859 100644 --- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.sts; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java index 92a978931a117..8e028a334d9ec 100644 --- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.aws2.sts; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java index 40f43bec38081..1bfec16b6ee88 100644 --- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.sts.model.AssumeRoleResponse; diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java index 916db7eda268e..8565e3cf7bd1c 100644 --- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java +++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.sts.model.AssumeRoleResponse; import software.amazon.awssdk.services.sts.model.GetFederationTokenResponse; diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java index a9de63d33b8b9..25f78857fb233 100644 --- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java +++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-textract/pom.xml b/components/camel-aws/camel-aws2-textract/pom.xml index dd32e4dc1d213..0a6a1b1d70a8b 100644 --- a/components/camel-aws/camel-aws2-textract/pom.xml +++ b/components/camel-aws/camel-aws2-textract/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java index 189f8c801fe6b..445e41bc8c249 100644 --- a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java +++ b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.services.textract.model.DetectDocumentTextRequest; diff --git a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java index 5d5509aaa4f02..ec7fd50b79616 100644 --- a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java +++ b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.testcontainers.shaded.org.awaitility.Awaitility; diff --git a/components/camel-aws/camel-aws2-timestream/pom.xml b/components/camel-aws/camel-aws2-timestream/pom.xml index 3bdccaf74c1d1..434d24db42c6c 100644 --- a/components/camel-aws/camel-aws2-timestream/pom.xml +++ b/components/camel-aws/camel-aws2-timestream/pom.xml @@ -74,7 +74,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java index e8d1ca08953b4..64d2fef258cdf 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.aws2.timestream.query.Timestream2QueryEndpoint; import org.apache.camel.component.aws2.timestream.write.AmazonTimestreamWriteClientMock; import org.apache.camel.component.aws2.timestream.write.Timestream2WriteEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java index 648a718330222..00cae34245e11 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.aws2.timestream.query.Timestream2QueryEndpoint; import org.apache.camel.component.aws2.timestream.write.Timestream2WriteEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java index 6c76d4f209271..5fa5e0faa26d7 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java index aab9d7d515005..ddad6b9a34705 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java index ca48779559f76..c1ca12301d247 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.aws2.timestream.Timestream2Constants; import org.apache.camel.component.aws2.timestream.Timestream2Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.timestreamquery.model.*; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java index 846df528395c7..e63867c79e1c8 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.aws2.timestream.Timestream2Constants; import org.apache.camel.component.aws2.timestream.Timestream2Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.timestreamquery.model.*; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java index 94588992048ce..1e2b706dcd8e9 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java index e2398765c0f90..f29dad48b6f4c 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java index 22163ced7ba45..7bfac7207c829 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.aws2.timestream.Timestream2Constants; import org.apache.camel.component.aws2.timestream.Timestream2Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.timestreamwrite.model.*; diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java index 1ae7e56c71331..9ff45df6fe538 100644 --- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java +++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.aws2.timestream.Timestream2Constants; import org.apache.camel.component.aws2.timestream.Timestream2Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.timestreamwrite.model.*; diff --git a/components/camel-aws/camel-aws2-transcribe/pom.xml b/components/camel-aws/camel-aws2-transcribe/pom.xml index 13a4ce8dbbc4b..5d39e0bfe247a 100644 --- a/components/camel-aws/camel-aws2-transcribe/pom.xml +++ b/components/camel-aws/camel-aws2-transcribe/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java index c92e3e3340792..5a7ad82f25c7b 100644 --- a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java +++ b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.transcribe.model.*; diff --git a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java index 33e5c4198bda0..f931a04f89c32 100644 --- a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java +++ b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java @@ -26,7 +26,7 @@ import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.apache.camel.test.infra.common.SharedNameGenerator; import org.apache.camel.test.infra.common.TestEntityNameGenerator; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-aws/camel-aws2-translate/pom.xml b/components/camel-aws/camel-aws2-translate/pom.xml index 15232f149846c..54c18bd84f43c 100644 --- a/components/camel-aws/camel-aws2-translate/pom.xml +++ b/components/camel-aws/camel-aws2-translate/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java index 254c5860b84b5..6eb5decd87edd 100644 --- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java index 8f69ec7b503f3..7e55ed7100cf2 100644 --- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java +++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.impl.health.DefaultHealthCheckRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java index 4bde131494366..843afdbca7c52 100644 --- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java +++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.translate.model.TranslateTextRequest; diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java index 956b7f70d095c..0ac9b2cb8a8dd 100644 --- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java +++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.translate.model.TranslateTextRequest; diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java index 041795cfbf3f8..296558f07e440 100644 --- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java +++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.aws2.translate.Translate2LanguageEnum; import org.apache.camel.component.aws2.translate.Translate2Operations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml b/components/camel-azure/camel-azure-cosmosdb/pom.xml index e96569b998c23..72f5f8e380328 100644 --- a/components/camel-azure/camel-azure-cosmosdb/pom.xml +++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java index d2131719b04fa..0f2675fd01775 100644 --- a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java +++ b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java @@ -22,7 +22,7 @@ import com.azure.cosmos.models.IndexingMode; import com.azure.cosmos.models.IndexingPolicy; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java index 58b143d1dc6fd..87c31165df274 100644 --- a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java +++ b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java @@ -23,7 +23,7 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosClientBuilder; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.function.Executable; diff --git a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java index 356c403f78f32..01833bff34863 100644 --- a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java +++ b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.azure.cosmosdb.CosmosDbComponent; import org.apache.camel.component.azure.cosmosdb.CosmosDbTestUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public abstract class BaseCamelCosmosDbTestSupport extends CamelTestSupport { diff --git a/components/camel-azure/camel-azure-eventgrid/pom.xml b/components/camel-azure/camel-azure-eventgrid/pom.xml index 067e665e6b920..4afa9825f8bbf 100644 --- a/components/camel-azure/camel-azure-eventgrid/pom.xml +++ b/components/camel-azure/camel-azure-eventgrid/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java b/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java index dc67591aa2caa..c5f0dfb224444 100644 --- a/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java +++ b/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java @@ -19,7 +19,7 @@ import com.azure.identity.DefaultAzureCredential; import com.azure.identity.DefaultAzureCredentialBuilder; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml b/components/camel-azure/camel-azure-eventhubs/pom.xml index 0eaa1a593887c..f67eb1da5f2af 100644 --- a/components/camel-azure/camel-azure-eventhubs/pom.xml +++ b/components/camel-azure/camel-azure-eventhubs/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java index 15d3baa0ec38f..48924bf287f87 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java +++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java @@ -22,7 +22,7 @@ import com.azure.messaging.eventhubs.EventHubProducerAsyncClient; import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java index 9104f8eedd91a..af7d9def72b76 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java +++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Properties; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; public final class TestUtils { diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java index 5403d6be97e37..a5019b203bb15 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java +++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java @@ -37,7 +37,7 @@ import org.apache.camel.component.azure.eventhubs.TestUtils; import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java index 222cb7223f55e..62471697c9868 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java +++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java @@ -34,7 +34,7 @@ import org.apache.camel.component.azure.eventhubs.TestUtils; import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java index acf052f15b5d8..59ff86733743c 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java +++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java @@ -33,7 +33,7 @@ import org.apache.camel.component.azure.eventhubs.TestUtils; import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java index a152acdcd9b16..e57ced1a38ad5 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java +++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java @@ -33,7 +33,7 @@ import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory; import org.apache.camel.component.azure.eventhubs.operations.EventHubsProducerOperations; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-azure/camel-azure-files/pom.xml b/components/camel-azure/camel-azure-files/pom.xml index 5d04460af7d4e..d8d5136af0647 100644 --- a/components/camel-azure/camel-azure-files/pom.xml +++ b/components/camel-azure/camel-azure-files/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java index 49a14c6457976..07a4d70015d08 100644 --- a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java +++ b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.file.azure; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java index 4fc7e2d67b72f..c9cdeff6d3bf2 100644 --- a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java +++ b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.file.azure; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java index 35140ef35633e..84e1bb9b99f62 100644 --- a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java +++ b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java @@ -19,7 +19,7 @@ import com.azure.core.http.policy.AzureSasCredentialPolicy; import com.azure.core.http.policy.BearerTokenAuthenticationPolicy; import com.azure.storage.common.policy.StorageSharedKeyCredentialPolicy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml b/components/camel-azure/camel-azure-key-vault/pom.xml index 99b8e486009d7..2626da31c6092 100644 --- a/components/camel-azure/camel-azure-key-vault/pom.xml +++ b/components/camel-azure/camel-azure-key-vault/pom.xml @@ -73,7 +73,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java index 17effb111cdb4..5d8c1cd2beaab 100644 --- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java +++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java @@ -19,7 +19,7 @@ import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.security.keyvault.secrets.SecretClient; import com.azure.security.keyvault.secrets.SecretClientBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java index 575678a6ae32c..e185592247fff 100644 --- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java +++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.azure.key.vault.KeyVaultConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java index 87ba50605127c..657c3a8e45e18 100644 --- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java +++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java @@ -19,7 +19,7 @@ import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-azure/camel-azure-schema-registry/pom.xml b/components/camel-azure/camel-azure-schema-registry/pom.xml index 97cfcbfbbb308..9c0d12dac6f74 100644 --- a/components/camel-azure/camel-azure-schema-registry/pom.xml +++ b/components/camel-azure/camel-azure-schema-registry/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml b/components/camel-azure/camel-azure-servicebus/pom.xml index 41a1ecdf376b6..77a0411d4e7fa 100644 --- a/components/camel-azure/camel-azure-servicebus/pom.xml +++ b/components/camel-azure/camel-azure-servicebus/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java index c4a87039ce9b3..e54f09d31d6ee 100644 --- a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java +++ b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java @@ -27,7 +27,7 @@ import org.apache.camel.FailedToCreateProducerException; import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.component.azure.servicebus.client.ServiceBusClientFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml b/components/camel-azure/camel-azure-storage-blob/pom.xml index c404d861a023f..6b5127fa52449 100644 --- a/components/camel-azure/camel-azure-storage-blob/pom.xml +++ b/components/camel-azure/camel-azure-storage-blob/pom.xml @@ -87,7 +87,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java index 9bfa1aa4d0551..68e7bdccf41f6 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Producer; import org.apache.camel.component.azure.storage.blob.client.BlobClientFactory; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.azure.storage.blob.CredentialType.SHARED_KEY_CREDENTIAL; diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java index 59a5a8cbb97f1..2103e4d208500 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java index 21ea89972526c..fd509255521dd 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java @@ -18,7 +18,7 @@ import java.util.Properties; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; public final class BlobTestUtils { diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java index d863f222f31f0..bf8a48149f1bd 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java @@ -24,7 +24,7 @@ import org.apache.camel.test.infra.azure.common.services.AzureService; import org.apache.camel.test.infra.azure.storage.blob.clients.AzureStorageBlobClientUtils; import org.apache.camel.test.infra.azure.storage.blob.services.AzureStorageBlobServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java index 80af145a52180..2b3a033e9b212 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.azure.storage.blob.BlobConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java index 3e7755113dfec..12c28cad6832d 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java @@ -40,7 +40,7 @@ import org.apache.camel.component.azure.storage.blob.BlobType; import org.apache.camel.component.azure.storage.blob.client.BlobClientWrapper; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml b/components/camel-azure/camel-azure-storage-datalake/pom.xml index 491aba690c5e0..5d8de2e88ca5c 100644 --- a/components/camel-azure/camel-azure-storage-datalake/pom.xml +++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java index 358fd92281995..31030e6d391e3 100644 --- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java +++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.azure.storage.datalake.DataLakeEndpoint; import org.apache.camel.component.azure.storage.datalake.DataLakeOperationsDefinition; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java index bb6d4d2436709..743ec3d053f44 100644 --- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java +++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java @@ -30,7 +30,7 @@ import org.apache.camel.test.infra.azure.common.services.AzureService; import org.apache.camel.test.infra.azure.storage.datalake.clients.AzureStorageDataLakeClientUtils; import org.apache.camel.test.infra.azure.storage.datalake.services.AzureStorageDataLakeServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java index 216843106242b..bfc849894f965 100644 --- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java +++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java @@ -21,7 +21,7 @@ import com.azure.storage.file.datalake.DataLakeFileClient; import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration; import org.apache.camel.component.azure.storage.datalake.client.DataLakeDirectoryClientWrapper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java index 0c3380d43b7f2..82c0e2bb976cc 100644 --- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java +++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java @@ -34,7 +34,7 @@ import org.apache.camel.component.azure.storage.datalake.DataLakeConstants; import org.apache.camel.component.azure.storage.datalake.client.DataLakeFileClientWrapper; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java index eee0364982b77..66507a4b746a2 100644 --- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java +++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration; import org.apache.camel.component.azure.storage.datalake.DataLakeConstants; import org.apache.camel.component.azure.storage.datalake.client.DataLakeFileSystemClientWrapper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml b/components/camel-azure/camel-azure-storage-queue/pom.xml index 911aff93c2cab..51f198e1d8183 100644 --- a/components/camel-azure/camel-azure-storage-queue/pom.xml +++ b/components/camel-azure/camel-azure-storage-queue/pom.xml @@ -83,7 +83,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java index 66c46c44f8449..d4afd60314be9 100644 --- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java +++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.component.azure.storage.queue.client.QueueClientFactory; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java index eb3709a6b1945..eedb570cb2285 100644 --- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java +++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java index e65557f4751e7..6f32e3911a5c3 100644 --- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java +++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Properties; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java index 4ec39797b0063..666e361eeb49d 100644 --- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java +++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java @@ -24,7 +24,7 @@ import org.apache.camel.test.infra.azure.common.services.AzureService; import org.apache.camel.test.infra.azure.storage.queue.clients.AzureStorageClientUtils; import org.apache.camel.test.infra.azure.storage.queue.services.AzureStorageQueueServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java index 1ae5e8148ff52..9da39676a4d1f 100644 --- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java +++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.azure.storage.queue.QueueConstants; import org.apache.camel.component.azure.storage.queue.client.QueueClientWrapper; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java index f2c3feb3a4818..a5c68540cd58f 100644 --- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java +++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java @@ -34,7 +34,7 @@ import org.apache.camel.component.azure.storage.queue.operations.QueueOperationResponse; import org.apache.camel.component.azure.storage.queue.operations.QueueOperations; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml index e991d65d85da6..2fe07bd7deea8 100644 --- a/components/camel-barcode/pom.xml +++ b/components/camel-barcode/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java index 35f31a6be68b0..bed4be68cc425 100644 --- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java +++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java index c1aafc139da32..b60f7dfd1a1c7 100644 --- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java +++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.spring.SpringCamelContext; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.condition.DisabledOnOs; import org.springframework.context.ApplicationContext; diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java index ffeb9257c0adb..71f86e7d41872 100644 --- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java +++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java @@ -36,7 +36,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.FileUtil; import org.apache.camel.util.IOHelper; diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml index f3d4d9c5fe06b..d9d6eee9296f2 100644 --- a/components/camel-base64/pom.xml +++ b/components/camel-base64/pom.xml @@ -53,12 +53,12 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java index dc382726086c1..133d8b2a2eae5 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java @@ -19,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java index 865b194e8acf1..e0817b184feb0 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Base64PropertiesFunctionDecodeTest extends CamelTestSupport { diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java index 3aff51ebbdd07..bf465c94fff66 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Base64PropertiesFunctionOptionalTest extends CamelTestSupport { diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java index 5c392fb9f0cdc..6a11a46c0b6b2 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Base64PropertiesFunctionTest extends CamelTestSupport { diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java index 6c38bd21ae1fe..cad581b16ffdf 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java @@ -17,7 +17,7 @@ package org.apache.camel.dataformat.base64; import org.apache.camel.Expression; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java index 0f8956feffbb9..67756cf5809fa 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java @@ -18,7 +18,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml index 99d8dd40e859e..acf2e529c6b6d 100644 --- a/components/camel-bean-validator/pom.xml +++ b/components/camel-bean-validator/pom.xml @@ -80,7 +80,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java index 74d0798c5033d..0aac0d949642a 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java @@ -27,7 +27,7 @@ import jakarta.validation.TraversableResolver; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java index e9068fe16a1b2..e23b6de4c34e7 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; @@ -35,7 +35,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java index 7fce18c0512ec..bd91721b85eb8 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java @@ -23,7 +23,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.hibernate.validator.HibernateValidator; import org.junit.jupiter.api.Test; 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 0f6b4c8e48240..354747db4dfa2 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 @@ -22,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class HibernateValidationProviderResolverTest extends CamelTestSupport { diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java index a5ada810688ff..dd83634724176 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java @@ -21,7 +21,7 @@ import jakarta.validation.bootstrap.GenericBootstrap; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java index d409c99a2fa11..7ac3861a76d7f 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java @@ -21,7 +21,7 @@ import jakarta.validation.bootstrap.GenericBootstrap; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java index 390717fabd911..c96e3e01870c0 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.bean.validator; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-beanio/pom.xml b/components/camel-beanio/pom.xml index 52aa20a9727c8..2cc2597335d99 100644 --- a/components/camel-beanio/pom.xml +++ b/components/camel-beanio/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java index 11e1585b6a466..b9f3e80f68c33 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.beanio.InvalidRecordException; import org.beanio.UnexpectedRecordException; import org.beanio.UnidentifiedRecordException; @@ -33,7 +33,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; public class BeanIODataFormatComplexTest extends CamelTestSupport { diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java index dc278aa83d80f..26c34d5b9cd50 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java index 52ca0f73ca0e7..f7f4fec1f4a7f 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class BeanIODataFormatSimpleTest extends CamelTestSupport { diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java index 00150fbb55760..24ff3ec22f894 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java index 68d5a379a7221..49048f8418d04 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class BeanIOSplitterTest extends CamelTestSupport { diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java index a61f7e74d4745..b6f3f54c65f68 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java index ac3c9d7594c90..508f21fc886d4 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java index b11818f10fb51..7dae4f62c3423 100644 --- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java +++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.beanio.BeanIODataFormat; import org.apache.camel.dataformat.beanio.Constants; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml index 830b670f29339..f150fb424dafc 100644 --- a/components/camel-bindy/pom.xml +++ b/components/camel-bindy/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java index 295d33813e137..142a60701f029 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java index 2ffa6b5e3de1d..1da0cb1dca6ff 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java index c48d415808e92..3325e43089a53 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java index c688f9b4ef15f..24cf12b763acc 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.dataformat.bindy.model.car.Car; import org.apache.camel.dataformat.bindy.model.car.Car.Colour; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java index 3c246c853911f..de2505994396c 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java @@ -32,7 +32,7 @@ import org.apache.camel.dataformat.bindy.model.complex.generateheader.Client; import org.apache.camel.dataformat.bindy.model.complex.generateheader.Order; import org.apache.camel.dataformat.bindy.model.complex.generateheader.Security; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java index 9c6b07d676823..517d019e0aeea 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java @@ -32,7 +32,7 @@ import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Client; import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order; import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Security; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java index 692834c899268..da84433e6595b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java index f7032d4b1db25..e6fd7b7669dac 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java index 752e9cb77193f..4c6f5439d6777 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java index f089aabf965f4..be1d6bdc1360e 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java @@ -21,7 +21,7 @@ import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java index bf779aa3de901..4ee4ce53cdcd7 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java index 1605ad2ae67bc..27e9096753703 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java @@ -23,7 +23,7 @@ import org.apache.camel.dataformat.bindy.model.csv.MyCsvRecord; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java index ccf099b92d9bb..6cd954de473a9 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java index 3fe132d0bb064..739a99de7cb8f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.csv.MyCsvRecord; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java index 3c4a7825b99c5..b2950d078923b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java index 93566eb2e72ee..df044ea6c36c8 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java index 8e12e50b6cc55..4ee47b9faea1b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java index 32ca699263707..6fdffd644ca41 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java @@ -28,7 +28,7 @@ import org.apache.camel.dataformat.bindy.annotation.BindyConverter; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java index 19722444ddb57..a16c189d90817 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java index 12f8db0bec288..3a5a79f66831a 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java @@ -23,7 +23,7 @@ import org.apache.camel.dataformat.bindy.model.csv.MyCsvRecord2; import org.apache.camel.dataformat.bindy.util.ConverterUtils; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java index 18c2b75658887..3f37787ec91d3 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.linkonetomany.Order; import org.apache.camel.dataformat.bindy.model.simple.linkonetomany.OrderItem; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java index eff889333ca2b..68d2626bc6a6d 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.padding.Unity; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java index c233af26fb133..2b21f853cd323 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java index 2ec7b41467453..1cba0214c31f1 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java index c32259b1071fc..4a834a116741e 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java index 49c026627e2a6..c523d1c222918 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.spanLastRecord.SpanLastRecord; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java index 91dd9824c39e5..c50f2eb3da4c3 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java index ef0dbc49eede7..88639eba21404 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java index e89d9a045d84f..af0f86398dae9 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java index 0e1b0e9d2ad16..dc45760ef761b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.util.ConverterUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java index 380810653bc72..fb172f570094b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.util.ConverterUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java index ded11e2513b6e..86944eabcfaa7 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.util.ConverterUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java index 9fd6323c17427..b724fd49ae6be 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.util.ConverterUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java index 44b9a75416de2..dc885b30b75ec 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java @@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclassgenerateheader.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java index 5a74d376be5dc..6cb5a0346a060 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java index f41a8bd942e85..156ef63e24017 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java index ed1391e13c51e..eab03377d15e4 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java @@ -32,7 +32,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; import org.apache.camel.model.dataformat.BindyDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java index 32bd59b2b60c9..b693b3b5613f5 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java @@ -31,7 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java index bf8e06e04a5df..fc6095d5f97c1 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclassandtrimandclip.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java index 3fe3ed0b976b1..93bbf81e3eb21 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java @@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java index 3a8652687ce0f..40e7f040110bc 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.onetomany.Author; import org.apache.camel.dataformat.bindy.model.simple.onetomany.Book; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvQuotingOnlyWhenNeededTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvQuotingOnlyWhenNeededTest.java index 3051e076b2e43..c9bc0cb035b4f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvQuotingOnlyWhenNeededTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvQuotingOnlyWhenNeededTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java index f8c500b5595da..9a31ffa819a6f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.spanLastRecord.RegexSpanLastRecord; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java index fe0733d5589ed..324d84ddc21dd 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java index 052539115e99b..1a07d82768984 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java index 71086a1f81b20..668fd03b4b55f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java @@ -22,14 +22,14 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; @ContextConfiguration diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java index f5c944d833fe6..3b7e2ce03592e 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java @@ -23,12 +23,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.format.FormatException; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; @ContextConfiguration diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java index 6e3c19da4df17..cd8a1312e6cbf 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java @@ -26,12 +26,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.format.FormatException; import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTrimLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTrimLineTest.java index 8ef1f865e7997..2b523ea89df03 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTrimLineTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTrimLineTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java index b062a86dc1cf0..48c583654b6ed 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.unicode.LocationRecord; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java index 169c0ff48b6ef..1c11dc35c6a3d 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java index 80df6a4b38d36..5fd0b6a49daeb 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java index 4fada4bfb4593..5cfeed1d60bec 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java index be41e2350f109..c5086b871e92f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.tab.PurchaseOrder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java index b22286dab67a7..a9fa85e89903b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java index 1becd433f3844..22f107f600007 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.util.ConverterUtils; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java index 4bf4cd245b3c2..f1dde14472630 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java index 3f767d2f3ca63..e8a0248045be4 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.util.ConverterUtils; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java index 3d266229c90ea..971508f35347a 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java index a53085c652224..b003b428e6695 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java @@ -29,7 +29,7 @@ import org.apache.camel.dataformat.bindy.annotation.Message; import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java index 518150a8a3a79..812c1fc2c26ad 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.model.fix.simple.Order; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java index eb497838620ed..c8eb80fd36ba0 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java @@ -30,7 +30,7 @@ import org.apache.camel.dataformat.bindy.model.fix.simple.Header; import org.apache.camel.dataformat.bindy.model.fix.simple.Order; import org.apache.camel.dataformat.bindy.model.fix.simple.Trailer; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java index b2964d7716e88..bc50ca1e1c2e9 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java @@ -30,7 +30,7 @@ import org.apache.camel.dataformat.bindy.model.fix.simple.Header; import org.apache.camel.dataformat.bindy.model.fix.simple.Order; import org.apache.camel.dataformat.bindy.model.fix.simple.Trailer; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java index 565b1e9681776..4ed8edea1e6da 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java @@ -24,7 +24,7 @@ import org.apache.camel.dataformat.bindy.annotation.KeyValuePairField; import org.apache.camel.dataformat.bindy.annotation.Message; import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java index 75cab21fd2b85..f9cd8dd878192 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat; import org.apache.camel.dataformat.bindy.model.fix.withoutsection.Order; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java index e330c60bb0adb..43be0bfaa5b04 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java index f5a01d9499ce7..8964d2b465141 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java @@ -22,7 +22,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java index f93f0892edf98..684c79dca721a 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java @@ -28,7 +28,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java index 780c03838d908..ba32db9739929 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java @@ -29,7 +29,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java index 9bee5f327f065..36fd15f145b2d 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java @@ -29,7 +29,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java index 63b6a3e8ebfca..8ff6b500529f3 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java @@ -32,7 +32,7 @@ import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java index 277fabddeedf5..6873a2e5773ea 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java index 04457130e6aa3..0d1d437f0f6e8 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java @@ -28,7 +28,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindyRaceConditionLinkTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindyRaceConditionLinkTest.java index d47369948391b..15cc1e72c32be 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindyRaceConditionLinkTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindyRaceConditionLinkTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat; import org.apache.camel.dataformat.bindy.model.fixed.link.MyModel; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java index 80b3ac3851ea6..6344c838ead6b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java @@ -25,7 +25,7 @@ import org.apache.camel.dataformat.bindy.annotation.Link; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java index 8bc69b3573726..e037f6b152925 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java @@ -34,7 +34,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java index 035b6f918d80a..e26cef9b2bb99 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java @@ -30,7 +30,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class BindySimpleFixedLengthMarshallWithClipAndTrimTest extends CamelTestSupport { diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java index 3ab1e8c7ad1b8..bc73b52fe08e0 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java @@ -30,7 +30,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class BindySimpleFixedLengthMarshallWithClipTest extends CamelTestSupport { diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java index dcf1762e0fda2..c57026f0ac66f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java @@ -30,10 +30,10 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyCountGraphemeTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyCountGraphemeTest.java index cea8182aaeaec..9b6eeec127d6d 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyCountGraphemeTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyCountGraphemeTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class BindyCountGraphemeTest extends CamelTestSupport { diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyMultiBytesTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyMultiBytesTest.java index 32cb38db7fa24..68b8a69d67ef8 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyMultiBytesTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/multibytes/BindyMultiBytesTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java index 757da3e06e49f..75e5f49b91611 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java @@ -28,7 +28,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java index b0e49d3142ac9..7758903081da0 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java @@ -29,7 +29,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java index b37633dff7399..671c2b2edd017 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java index 6df93f4e3b99d..c7a4a76a0e22e 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java @@ -32,7 +32,7 @@ import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java index 627a1dae99592..e214ee224982f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java index 67d1950d968d1..8d8d53b3a9e4e 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java index 2e8a886faf293..f5b5093662809 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java index 5f9820ce2bd2d..d5018c0ee1cf5 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java index 300ad9b18f1aa..51b66f38e7532 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java index 8e11bc5f20f22..78f0c29964cdd 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java @@ -34,7 +34,7 @@ import org.apache.camel.dataformat.bindy.annotation.FormatFactories; import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat; import org.apache.camel.dataformat.bindy.format.factories.AbstractFormatFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java index 0436a4bfd3df2..4d18fce49ecb1 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java index be756e365c1d5..f609c3922f40b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java @@ -27,7 +27,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.model.dataformat.BindyDataFormat; import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml index b7f37b46dbe39..cac320a330bd4 100644 --- a/components/camel-bonita/pom.xml +++ b/components/camel-bonita/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java index 359f23a1b489f..fcafcac201adb 100644 --- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java +++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java @@ -18,7 +18,7 @@ import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.component.bonita.util.BonitaOperation; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java index f6864cee42a67..5c41682680114 100644 --- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java +++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.component.bonita.integration; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class BonitaIntegrationTestSupport extends CamelTestSupport { diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml index 8abe215ee2be2..ff2760ff7b35d 100644 --- a/components/camel-box/camel-box-component/pom.xml +++ b/components/camel-box/camel-box-component/pom.xml @@ -75,7 +75,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java index d91385e09d675..846989d6c8dcc 100644 --- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java +++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxITSupport.java @@ -26,8 +26,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml index a9588bc57a437..b50d07d664772 100644 --- a/components/camel-braintree/pom.xml +++ b/components/camel-braintree/pom.xml @@ -63,7 +63,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java index d1ffe172f9aa5..f9a7094919299 100644 --- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java +++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java @@ -30,8 +30,8 @@ import org.apache.camel.component.braintree.internal.BraintreeLogHandler; import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.component.ApiMethod; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.TestInstance; import org.slf4j.Logger; diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIT.java index 4ccbb09f67e9a..f7debcb9e334e 100644 --- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIT.java +++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIT.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIT.java index 0ee14b713f4c4..70a164f7606c7 100644 --- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIT.java +++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIT.java @@ -44,7 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-caffeine/pom.xml b/components/camel-caffeine/pom.xml index 5ccb87d35a7db..31f875cea399f 100644 --- a/components/camel-caffeine/pom.xml +++ b/components/camel-caffeine/pom.xml @@ -48,12 +48,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java index cfc6e204f9409..0c87316106cdd 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.caffeine.CaffeineConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CaffeineCacheFromScratchProducerTest extends CamelTestSupport { diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java index 68804361a4eae..fa74f6c0c6242 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.caffeine.CaffeineConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java index b8aa87540a503..7be210a3acadf 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java @@ -30,7 +30,7 @@ import com.github.benmanes.caffeine.cache.RemovalCause; import com.github.benmanes.caffeine.cache.RemovalListener; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java index 6e66de62bca87..7fdca24c0801e 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java @@ -20,7 +20,7 @@ import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class CaffeineLoadCacheTestSupport extends CamelTestSupport { diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java index 0d22ae8f52bd3..e62cf8aec4aae 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.DefaultExchangeHolder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java index a9bcb746a78d7..cf4a60750cf2b 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java @@ -27,7 +27,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CaffeineAggregationRepositoryRoutesTest extends CamelTestSupport { diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java index 7bdc9b03c70a2..5ac84dd2c3aca 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java @@ -21,7 +21,7 @@ import com.github.benmanes.caffeine.cache.Cache; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryWithSplitTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryWithSplitTest.java index 7893d5fcc8e4c..bf3347c52918f 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryWithSplitTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryWithSplitTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CaffeineIdempotentRepositoryWithSplitTest extends CamelTestSupport { diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml index 5df6c4bb09ff2..4454ec399a28d 100644 --- a/components/camel-cassandraql/pom.xml +++ b/components/camel-cassandraql/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java index 8bccd5bccf077..20f58939849b0 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java index ba426bd007b2b..a275749ce0b95 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraCamelCodecTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraCamelCodecTest.java index 29b1909956c22..f527db6c45d80 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraCamelCodecTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraCamelCodecTest.java @@ -19,7 +19,7 @@ import java.io.*; import java.nio.ByteBuffer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-cbor/pom.xml b/components/camel-cbor/pom.xml index 7147d7300ad3a..d469626117e6f 100644 --- a/components/camel-cbor/pom.xml +++ b/components/camel-cbor/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java index 2cbdb2dc97718..fb9b6ba1f2d73 100644 --- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java +++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORDataFormatTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java index 72bbd716a1c42..e33bf9e1db9c6 100644 --- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java +++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.dataformat.cbor.CBORFactory; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java index c368f2cb1d50c..3402dd08324f4 100644 --- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java +++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java @@ -24,10 +24,10 @@ import com.fasterxml.jackson.dataformat.cbor.CBORFactory; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class CBORObjectListSplitTest extends CamelTestSupport { @Test diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORUseDefaultMapperWithNonCBORMapperInRegistryTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORUseDefaultMapperWithNonCBORMapperInRegistryTest.java index 8d6a988a65458..98de310d97623 100644 --- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORUseDefaultMapperWithNonCBORMapperInRegistryTest.java +++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORUseDefaultMapperWithNonCBORMapperInRegistryTest.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java index 9e228513290c1..8a82916c41217 100644 --- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java +++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/SpringCBORDataFormatTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml index 7e332d1dcfa9e..b459818658c36 100644 --- a/components/camel-chunk/pom.xml +++ b/components/camel-chunk/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java index fd21007acd059..20c3d3805fef3 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java index cbd4ec4993678..5a0d5605f4d15 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java index bd9083d5470d6..656aa8af0b51b 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java index 1d1ed6b4f125f..fb2c35c2c6e9f 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java index 2bf1ce5dadcb0..398ae993cf32a 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java index 28b273c7601ae..b370df3b976c3 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java index 8d1149556e148..58a10e673e22a 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java index e24506b9e0de6..0aa149ebf0ae7 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java index aa55e200644f0..1e791722c2169 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java index 989fe8de661dd..7941a15623eec 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkRefTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkRefTest.java index 7aec5b6a0d711..c6d08b41e1aa3 100644 --- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkRefTest.java +++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkRefTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-clickup/pom.xml b/components/camel-clickup/pom.xml index e8aa805838018..18f206b453754 100644 --- a/components/camel-clickup/pom.xml +++ b/components/camel-clickup/pom.xml @@ -73,7 +73,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationAlreadyExistsTest.java b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationAlreadyExistsTest.java index 2084e4883a30d..c1658407bff08 100644 --- a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationAlreadyExistsTest.java +++ b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationAlreadyExistsTest.java @@ -41,7 +41,7 @@ import org.apache.camel.component.webhook.WebhookConfiguration; import org.apache.camel.component.webhook.WebhookEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.TestExecutionConfiguration; +import org.apache.camel.test.junit6.TestExecutionConfiguration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationTest.java b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationTest.java index 961ce9d32b929..fdc3f55bd4363 100644 --- a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationTest.java +++ b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookRegistrationTest.java @@ -33,7 +33,7 @@ import org.apache.camel.component.clickup.util.ClickUpMockRoutes; import org.apache.camel.component.clickup.util.ClickUpTestSupport; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.TestExecutionConfiguration; +import org.apache.camel.test.junit6.TestExecutionConfiguration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java index 70afffa75d554..c68c3bde21aaa 100644 --- a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java +++ b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.clickup.ClickUpComponent; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; /** diff --git a/components/camel-cloudevents/pom.xml b/components/camel-cloudevents/pom.xml index 6e4fe6532d8b1..7a4b60d67278b 100644 --- a/components/camel-cloudevents/pom.xml +++ b/components/camel-cloudevents/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml index 3ea4fe673bad9..8f00beb3b552c 100644 --- a/components/camel-cm-sms/pom.xml +++ b/components/camel-cm-sms/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java index 11b28a73befdf..9c864de066f83 100644 --- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java +++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java @@ -23,7 +23,7 @@ import jakarta.validation.Validator; import org.apache.camel.component.cm.CMConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.NullSource; diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java index 2e7d5c35510dc..ea4ed0c4b15f5 100644 --- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java +++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java @@ -20,7 +20,7 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; import org.apache.camel.component.cm.CMConstants; import org.apache.camel.component.cm.CMMessage; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java index be4ebd6397352..3bca0c65b4b20 100644 --- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java +++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java @@ -50,7 +50,7 @@ import org.apache.camel.component.cm.test.mocks.cmsender.UnknownErrorExceptionSender; import org.apache.camel.component.cm.test.mocks.cmsender.UnroutableMessageExceptionSender; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java index 8bcfa46a61c10..280ecfde0dee7 100644 --- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java +++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java index 31f77d0d110e3..fa069db5cdd60 100644 --- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java +++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java @@ -26,7 +26,7 @@ import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; import org.apache.camel.component.cm.client.SMSMessage; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml index 4ab4ca59ebe7a..37823a1a92b18 100644 --- a/components/camel-coap/pom.xml +++ b/components/camel-coap/pom.xml @@ -91,7 +91,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java index 4fd14373b7e72..f7479a21747b0 100644 --- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java +++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java @@ -36,7 +36,7 @@ import org.apache.camel.support.jsse.SSLContextServerParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.californium.core.coap.CoAP; import org.eclipse.californium.core.coap.MediaTypeRegistry; import org.eclipse.californium.scandium.dtls.pskstore.AdvancedPskStore; diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java index 9c3d5a2e6e03f..c0748812a51a7 100644 --- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java +++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.rest.RestConfigurationDefinition; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.californium.core.CoapClient; import org.eclipse.californium.core.CoapResponse; import org.eclipse.californium.core.coap.CoAP; diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java index 46403db22bc3e..bf7a692e1c992 100644 --- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java +++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.coap; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.FileUtil; import org.eclipse.californium.core.CoapClient; import org.eclipse.californium.elements.config.Configuration; diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml index 7b3513a7b73fa..c800ed389d5a1 100644 --- a/components/camel-cometd/pom.xml +++ b/components/camel-cometd/pom.xml @@ -83,7 +83,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java index ca3db868a77b4..a746a792c8d3c 100644 --- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java +++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.cometd.bayeux.server.BayeuxServer; import org.cometd.bayeux.server.SecurityPolicy; import org.cometd.bayeux.server.ServerChannel; diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java index 930149c13c309..64b9458c33393 100644 --- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java +++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java index eceb860693b9c..a3e02aa5442c2 100644 --- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java +++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java index 0c4c328654d07..524fea203cf24 100644 --- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java +++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java index 73337a0f43d93..3aebac0889a46 100644 --- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java +++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java index 0f76d8e274c37..958aedbc31ca3 100644 --- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java +++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java @@ -28,7 +28,7 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml index a59c66d7cc530..c09d8393981a4 100644 --- a/components/camel-consul/pom.xml +++ b/components/camel-consul/pom.xml @@ -131,13 +131,13 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java index 1aecc6a63c8e8..40e1de3fc4ab6 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.consul.endpoint.ConsulHealthActions; import org.apache.camel.test.infra.consul.services.ConsulService; import org.apache.camel.test.infra.consul.services.ConsulServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.kiwiproject.consul.AgentClient; diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java index b5384e677ec7c..0f79c5773bd2c 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java @@ -23,8 +23,8 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.test.infra.consul.services.ConsulService; import org.apache.camel.test.infra.consul.services.ConsulServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestNameExtension; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestNameExtension; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.extension.RegisterExtension; import org.kiwiproject.consul.Consul; diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java index e5afcbbfc0aaa..e326c32a38b2b 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.consul.endpoint.ConsulAgentActions; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.kiwiproject.consul.model.health.ImmutableService; diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java index d67046f5053ee..b7cb02bb0901a 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockCatalogTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.consul.endpoint.ConsulCatalogActions; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.kiwiproject.consul.model.health.ImmutableNode; diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java index 5eeabb14ae153..df4fa062a45bf 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java @@ -29,7 +29,7 @@ import org.apache.camel.processor.FilterProcessor; import org.apache.camel.test.infra.consul.services.ConsulService; import org.apache.camel.test.infra.consul.services.ConsulServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml index 35f487d730575..c2aa95065434f 100644 --- a/components/camel-couchbase/pom.xml +++ b/components/camel-couchbase/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseComponentTest.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseComponentTest.java index f8911f43c1389..471458ba063e9 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseComponentTest.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseComponentTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java index 257f9c5821b81..9527880460131 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java @@ -29,7 +29,7 @@ import org.apache.camel.test.infra.common.TestUtils; import org.apache.camel.test.infra.couchbase.services.CouchbaseService; import org.apache.camel.test.infra.couchbase.services.CouchbaseServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml index a4a85409baf5e..8fa40096c37f6 100644 --- a/components/camel-couchdb/pom.xml +++ b/components/camel-couchdb/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java index 27f8e9aaf6c10..11c7d98b2cca7 100644 --- a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java +++ b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/integration/CouchDbTestSupport.java b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/integration/CouchDbTestSupport.java index 56073dd01a744..9e5fe536b498d 100644 --- a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/integration/CouchDbTestSupport.java +++ b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/integration/CouchDbTestSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.test.infra.couchdb.services.CouchDbService; import org.apache.camel.test.infra.couchdb.services.CouchDbServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; public class CouchDbTestSupport extends CamelTestSupport { diff --git a/components/camel-cron/pom.xml b/components/camel-cron/pom.xml index be3e6a91faa11..f9a5e00f93978 100644 --- a/components/camel-cron/pom.xml +++ b/components/camel-cron/pom.xml @@ -44,7 +44,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java index 3057ba4fbfb5a..b533b677a7d99 100644 --- a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java +++ b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cron.api.CamelCronService; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java index 0aa451210f405..2469308769af4 100644 --- a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java +++ b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.BeanIntrospection; import org.apache.camel.support.PluginHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/components/camel-crypto-pgp/pom.xml b/components/camel-crypto-pgp/pom.xml index 918183547daa2..40b221c7f6faf 100644 --- a/components/camel-crypto-pgp/pom.xml +++ b/components/camel-crypto-pgp/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-crypto-pgp/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java b/components/camel-crypto-pgp/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java index 8fc0792fbf572..a0e904a7d9aae 100644 --- a/components/camel-crypto-pgp/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java +++ b/components/camel-crypto-pgp/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml index f7a7996abfcfc..e234cf11006f2 100644 --- a/components/camel-crypto/pom.xml +++ b/components/camel-crypto/pom.xml @@ -44,7 +44,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test 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 e025ff20f1cfa..16f0c450bb116 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 @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; 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 fec744a43ad81..6e65c549219b7 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 @@ -37,7 +37,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.jsse.KeyStoreParameters; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java index 2e91db904324d..9deb77fe182d0 100644 --- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java +++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java @@ -35,7 +35,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-csimple-joor/pom.xml b/components/camel-csimple-joor/pom.xml index 74f3c00a910f5..9717eddf47153 100644 --- a/components/camel-csimple-joor/pom.xml +++ b/components/camel-csimple-joor/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleAttachmentsTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleAttachmentsTest.java index dcbdf9bb29288..ecb34a39d5265 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleAttachmentsTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleAttachmentsTest.java @@ -24,7 +24,7 @@ import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.attachment.CamelFileDataSource; import org.apache.camel.attachment.DefaultAttachment; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBase64Test.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBase64Test.java index 3e4e2280a0885..cb3a7c8c8eb10 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBase64Test.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBase64Test.java @@ -17,7 +17,7 @@ package org.apache.camel.language.csimple.joor; import org.apache.camel.Expression; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java index 4de592b7d93a1..1c3cfdd800a4f 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CSimpleBeanTest extends CamelTestSupport { diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java index b5aed8871ec24..013cfaca7f260 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CSimpleDecHeaderTest extends CamelTestSupport { diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java index 317bf9697d67e..bcbce628d6569 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CSimpleIncHeaderTest extends CamelTestSupport { diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java index 6c5da13a4f5b2..70b05ccde8d69 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CSimpleSetHeaderPredicateTest extends CamelTestSupport { diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java index 6a7186b3e8331..b8495b49d8916 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CSimpleTest extends CamelTestSupport { diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java index 66c04a29c819c..35a4ad632fa49 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.language.csimple.CSimpleExpression; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java index 36cf952228aeb..1effcebe6c766 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java index 180913cc4b570..b8077da66bfda 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java @@ -56,13 +56,13 @@ import org.apache.camel.support.DefaultUuidGenerator; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.support.LanguageHelper; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.apache.camel.util.InetAddressUtil; import org.apache.camel.util.StringHelper; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-csv/pom.xml b/components/camel-csv/pom.xml index 71aa799b9ab3a..acefb53265fb1 100644 --- a/components/camel-csv/pom.xml +++ b/components/camel-csv/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest.java index a98fc98fe6fc4..33bdad3b2809f 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomFactoryTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java index 97fffb7fee035..e7fac59e54c59 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.CastUtils; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatResourceFactoryTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatResourceFactoryTest.java index fc0341af1b32f..252a3ce3685c6 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatResourceFactoryTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatResourceFactoryTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java index be808ddf9d256..abf4e2bcbb0c9 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java @@ -23,7 +23,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java index bba64d790e83b..cb6ea7f4e0ecd 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java @@ -23,7 +23,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java index 1cf83fa10e1e4..b5eaaf3239c95 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java @@ -22,8 +22,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.assertNotNull; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderFromCsvFormatTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderFromCsvFormatTest.java index 7f1e085ade06d..73e4827cbd0ae 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderFromCsvFormatTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderFromCsvFormatTest.java @@ -32,7 +32,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.csv.CSVFormat; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java index cc8cff591c2fa..a1857348a97a7 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java @@ -32,7 +32,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java index d9ef280177d7b..c43c2636b54f1 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java @@ -38,7 +38,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.ObjectHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; import org.junit.jupiter.api.Test; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java index 0263af1a7e5d0..286ddb3d1f96c 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java @@ -23,7 +23,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java index e3e06474df860..fee01b4219143 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java @@ -24,7 +24,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.csv.TestUtils.LS; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java index 406b632cf4266..f83f0747ec00f 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java @@ -23,7 +23,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java index e7051ec9e55c0..db1b1440703de 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java index 3abf21f5a8a28..9e53739d06b5c 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java @@ -25,8 +25,8 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java index 87f3241f3bdf8..dd37628cf8acd 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java index dbfe3ce54af0e..b546279c30193 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java @@ -21,7 +21,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java index 636315f60c542..801f2a92d8773 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java index 902d695457312..b9ca0454b843a 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java @@ -21,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java index 9f7f6fd490970..44a01dbeed068 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java index ebde741523ea7..03fc2543beb87 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java @@ -21,7 +21,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java index 4b8d51c924878..41caf350b379b 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java @@ -25,7 +25,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.csv.TestUtils.LS; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java index 3f8d6bf170f05..9c4f74878503c 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java index dc06a2a20f9cb..02ec9bea02b61 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java @@ -21,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java index 14587b040cef9..c93ad91ebb490 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java @@ -27,11 +27,11 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.csv.TestUtils.asMap; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java index 884b3acb5cf90..d977e3e16ec3a 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java @@ -21,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml index 404af9427fb70..056ca1ae725e9 100644 --- a/components/camel-cxf/camel-cxf-common/pom.xml +++ b/components/camel-cxf/camel-cxf-common/pom.xml @@ -81,7 +81,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml index c6367a493497c..1cea3b515d2a4 100644 --- a/components/camel-cxf/camel-cxf-rest/pom.xml +++ b/components/camel-cxf/camel-cxf-rest/pom.xml @@ -98,7 +98,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java index 171d9b38aa682..15ac79d6c3521 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.jaxrs.client.WebClient; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java index 84d35ed86a85b..43605cd2487e4 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Synchronization; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.net.telnet.TelnetClient; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java index e352ef36887ff..18361308a45c0 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.cxf.jaxrs.testbean.CustomerServiceResource; import org.apache.camel.component.cxf.jaxrs.testbean.ServiceUtil; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java index 4903cec51b5f7..fb9b3f1b5737a 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.cxf.jaxrs.response.MyResponse; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java index fbbbe2b70e2eb..c8007ce9c723e 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; import org.apache.cxf.jaxrs.provider.json.JSONProvider; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java index f28c2d047d6af..00e9584a80d24 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.cxf.jaxrs.testbean.Customer; import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean; import org.apache.cxf.jaxrs.client.Client; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java index b383c25b37d44..a14490f9b24e5 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java @@ -25,7 +25,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java index befc4c66fefdc..b4a1c334d3757 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java @@ -32,7 +32,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.junit.jupiter.api.AfterEach; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsResponseWithHeadersTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsResponseWithHeadersTest.java index 8dda73c3d267c..d47909c9792ea 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsResponseWithHeadersTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsResponseWithHeadersTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.jaxrs.response.MyResponse; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java index 848a6bf2b7394..2e226b5f8fc6b 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.stream.CachedOutputStream; import org.apache.camel.spi.Synchronization; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java index 82dfc58da6ab7..6aaa10e4ebf65 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.CustomerList; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Order; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Product; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java index 22c1b87c7a2bd..af6b165c53b8e 100644 --- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java +++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java @@ -36,7 +36,7 @@ import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.CustomerList; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Order; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Product; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.message.MessageContentsList; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml index 25beee21784d2..874b7dea69065 100644 --- a/components/camel-cxf/camel-cxf-soap/pom.xml +++ b/components/camel-cxf/camel-cxf-soap/pom.xml @@ -102,7 +102,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CachedCxfPayloadTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CachedCxfPayloadTest.java index 9c76899ab1c0b..b04f9891fa0a5 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CachedCxfPayloadTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CachedCxfPayloadTest.java @@ -29,7 +29,7 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.TypeConversionException; import org.apache.camel.component.cxf.common.CxfPayload; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.apache.cxf.staxutils.StaxSource; import org.apache.cxf.staxutils.StaxUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java index b390cab6ff919..4de90c983332e 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java @@ -36,7 +36,7 @@ import org.apache.camel.StreamCache; import org.apache.camel.component.cxf.common.CxfPayload; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.apache.cxf.staxutils.StaxUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java index 0e6b3a16667be..175ece23a5164 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java index 051e14571e25d..daf5dfb82cc7a 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.wsdl_first.PersonMultiPartImpl; import org.apache.camel.wsdl_first.PersonMultiPartPortType; import org.apache.camel.wsdl_first.PersonMultiPartService; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java index c46dc8b73dfff..a6954228513ca 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java @@ -28,7 +28,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.wsdl_first.Person; import org.apache.camel.wsdl_first.PersonImpl; import org.apache.camel.wsdl_first.PersonService; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerClientDisconnectedTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerClientDisconnectedTest.java index b2d9a58cdb91b..2f1cd5364e8ca 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerClientDisconnectedTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerClientDisconnectedTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Synchronization; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.net.telnet.TelnetClient; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerContinuationTimeoutTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerContinuationTimeoutTest.java index 8b402f8e58025..5e53e5a8792d1 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerContinuationTimeoutTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerContinuationTimeoutTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerMessageTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerMessageTest.java index e1db1dd1057a5..ceb5ae6780f97 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerMessageTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerMessageTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.BusFactory; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.frontend.ClientProxyFactoryBean; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java index c65572b513ef4..6ed1571bb0d71 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java @@ -30,7 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.wsdl_first.Person; import org.apache.camel.wsdl_first.PersonService; import org.apache.camel.wsdl_first.UnknownPersonFault; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathClientServerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathClientServerTest.java index 8950602bb0e13..b1e6346a9cfa8 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathClientServerTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathClientServerTest.java @@ -33,7 +33,7 @@ import org.apache.camel.component.cxf.common.CxfPayload; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.language.xpath.XPathBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapHeader; @@ -41,7 +41,7 @@ import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class CxfConsumerPayloadXPathClientServerTest extends CamelTestSupport { diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java index 8c590b6483c6e..662a079d6e1ea 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java @@ -27,7 +27,7 @@ import org.apache.camel.language.xpath.XPathBuilder; import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.binding.soap.SoapHeader; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerProviderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerProviderTest.java index 45c847c0e3a11..8bb0683e680e6 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerProviderTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerProviderTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java index 39f8ffb28a6d3..ba5ff91670ace 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.DataFormat; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientFactoryBean; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerStreamCacheTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerStreamCacheTest.java index 05b4eae7a2e65..ddf9909b4ca5a 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerStreamCacheTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerStreamCacheTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.stream.CachedOutputStream; import org.apache.camel.spi.Synchronization; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java index b85d52bc26576..7daf04f0898c7 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.DataFormat; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientFactoryBean; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfCustomizedExceptionTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfCustomizedExceptionTest.java index 8250b16d4f578..ebc403c3dbc34 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfCustomizedExceptionTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfCustomizedExceptionTest.java @@ -35,7 +35,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyCamelContextAwareTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyCamelContextAwareTest.java index da127ceef54a9..48bff09ba96cd 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyCamelContextAwareTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyCamelContextAwareTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.CxfPayload; import org.apache.camel.component.cxf.common.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyPayloadModeTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyPayloadModeTest.java index 69513f0c144a9..ad4350e897e61 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyPayloadModeTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfJavaOnlyPayloadModeTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.CxfPayload; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMixedModeRouterTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMixedModeRouterTest.java index 270c3ef019054..35856b1e9e2a7 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMixedModeRouterTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMixedModeRouterTest.java @@ -32,7 +32,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.endpoint.Server; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java index 29dd8403014db..51f0ad0bc9a4d 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java index dec9a492b8474..7fcd6558923de 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.BusFactory; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java index 8e833442d450d..193f4046f8239 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java @@ -19,7 +19,7 @@ import jakarta.xml.ws.Endpoint; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; public class CxfPayLoadSoapHeaderTestAbstract extends CamelTestSupport { diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java index e9301533bebf9..d82e72e93f085 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java index f949b100c3580..373475b2aa324 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.URISupport; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Client; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java index 3a504f03ce8d1..c52c738834de2 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.http.base.cookie.ExchangeCookieHandler; import org.apache.camel.http.base.cookie.InstanceCookieHandler; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.jaxws.JaxWsServerFactoryBean; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java index 96551a7d4c6d7..b60e4746846dc 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.binding.soap.SoapBindingConstants; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java index c49df027729bf..f20746b16addd 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.BusFactory; import org.apache.cxf.frontend.ServerFactoryBean; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java index 15326c86a64b0..15802a26f5fe7 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.BusFactory; import org.apache.cxf.frontend.ServerFactoryBean; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java index 02f530cd79d49..4155a2e84b55a 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.wsdl_first.Person; import org.apache.camel.wsdl_first.PersonService; import org.apache.commons.lang3.RandomStringUtils; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSimpleRouterTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSimpleRouterTest.java index e83c51ed58a5e..66f13dd69bdcf 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSimpleRouterTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSimpleRouterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.frontend.ClientProxyFactoryBean; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java index 53cb5e2199223..9565f8335790a 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.PingMeFault; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java index 2d89c74807fc8..533923b91064a 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-cxf/camel-cxf-spring-rest/pom.xml b/components/camel-cxf/camel-cxf-spring-rest/pom.xml index d26952685dcca..b6c17f639ff5c 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/pom.xml +++ b/components/camel-cxf/camel-cxf-spring-rest/pom.xml @@ -93,7 +93,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java index cd0efab8471b9..eede907812a93 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerSessionTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerSessionTest.java index 21fa4da5a1bc2..42e5be078db1b 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerSessionTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerSessionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java index 7e659124c722c..f5c4fe0c8f593 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.cxf.common.CxfOperationException; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.CastUtils; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Client; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java index 44e869f45c931..1972da363bb79 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java @@ -44,7 +44,7 @@ import org.apache.camel.component.cxf.jaxrs.testbean.Customer; import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java index 53943ddcf0842..0fd82c26846b6 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; import org.apache.camel.support.jsse.SSLContextParameters; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java index c027c4e53a795..e591952868257 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java index 79d9a71e72052..6d34e19133b58 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java @@ -18,7 +18,7 @@ import java.util.List; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.ext.logging.LoggingInInterceptor; import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.interceptor.Interceptor; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java index 65f60efc5a749..4d4182aa23945 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerSessionTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerSessionTest.java index 4bfef8da59067..a2aada5c9023e 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerSessionTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerSessionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java index 5894508caf2e3..02ecb3a2460a3 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.cxf.common.CxfOperationException; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.CastUtils; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Client; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java index 45fa5ea653125..10c3d3590c927 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.cxf.jaxrs; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java index e7a7fa1181781..c4d7822a9e1fe 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.jaxrs.testbean.CustomException; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java index 077ed721036f2..9fc1d967786c7 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService; import org.apache.camel.component.cxf.spring.jaxrs.SpringJAXRSClientFactoryBean; import org.apache.camel.component.cxf.spring.jaxrs.SpringJAXRSServerFactoryBean; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslAsyncProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslAsyncProducerTest.java index fbcde2b8f9313..1154d93eed8f9 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslAsyncProducerTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslAsyncProducerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslProducerTest.java index cec2243ebe144..fffbf349d6a6c 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslProducerTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSslProducerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java index becba92d8a579..038d01e7c1ef3 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.CustomerList; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Order; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Product; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java index 42e43b8b60fb0..6dd9a273d0622 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java +++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java @@ -35,7 +35,7 @@ import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.CustomerList; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Order; import org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.Product; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.message.MessageContentsList; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml index cf5ebd7fee13e..2e21a97479498 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml +++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml @@ -86,7 +86,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java index 46ac60b9ede6f..e6ea114fa7cf6 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.http.base.HttpOperationFailedException; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.apache.hello_world_soap_http.Greeter; import org.apache.hello_world_soap_http.NoSuchCodeLitFault; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java index 5cfb56f8eabc2..e640e77eb6294 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java @@ -30,7 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.wsdl_first.JaxwsTestHandler; import org.apache.camel.wsdl_first.Person; import org.apache.camel.wsdl_first.PersonService; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java index d5d8ed8d81ea6..fbc6501aa786b 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java @@ -25,7 +25,7 @@ import javax.xml.namespace.QName; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.wsdl_first.Person; import org.apache.camel.wsdl_first.PersonImpl; import org.apache.camel.wsdl_first.PersonService; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfComponentEnableMtomTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfComponentEnableMtomTest.java index c4e0d29000055..47e177f46524e 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfComponentEnableMtomTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfComponentEnableMtomTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.component.cxf.jaxws.CxfEndpoint; import org.apache.camel.spring.SpringCamelContext; -import org.apache.camel.test.spring.junit5.MockEndpoints; +import org.apache.camel.test.spring.junit6.MockEndpoints; import org.apache.cxf.message.Message; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java index eddeede9b7c17..90137276be357 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java @@ -30,7 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.wsdl_first.Person; import org.apache.camel.wsdl_first.PersonService; import org.apache.cxf.endpoint.Client; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java index 511a490ee1e9b..de2fb98b81b14 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java @@ -25,7 +25,7 @@ import org.w3c.dom.NodeList; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java index be7a0db902ac5..1ffa0bde1deaf 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java @@ -28,7 +28,7 @@ import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.endpoint.Client; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; import org.apache.hello_world_soap_http.Greeter; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java index 7153b12486e8a..8628c68290263 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java index 8c3d7ce0cc331..633cdd183bb9e 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java @@ -28,7 +28,7 @@ import org.apache.camel.non_wrapper.UnknownPersonFault; import org.apache.camel.non_wrapper.types.GetPerson; import org.apache.camel.non_wrapper.types.GetPersonResponse; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java index 29b611ca03e3a..f3098da4642c3 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.cxf.jaxws.DefaultCxfBinding; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Synchronization; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.hello_world_soap_http.Greeter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java index 12999e175bd8e..ed7fbf0b41a84 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.CxfPayload; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.frontend.ClientProxyFactoryBean; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java index a4749e7d51749..30ef6e67681e9 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java @@ -40,7 +40,7 @@ import org.apache.camel.pizza.types.OrderPizzaResponseType; import org.apache.camel.pizza.types.OrderPizzaType; import org.apache.camel.pizza.types.ToppingsListType; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.headers.Header; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java index 15ee68fc22c39..2a5570bb1b3f8 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java @@ -19,7 +19,7 @@ import jakarta.xml.ws.Endpoint; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; public class CxfPayLoadSoapHeaderTestAbstract extends CamelTestSupport { diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java index 64540b61c6f4c..00261ce7b3098 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java index b7f5c41e5faa8..bdb1aaa263425 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java index 0a0dc527d4e6d..8f247771e3c3b 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java index 9913ac8c95586..a679bc5f58b93 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java index ceac0a2ae5f7d..d1401d8702ac1 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java index 14249edc82367..df02e141fcdda 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java index 6cb1ac36b5adc..51bbaf49ca747 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java @@ -24,7 +24,7 @@ import javax.xml.namespace.QName; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.wsdl_first.JaxwsTestHandler; import org.apache.hello_world_soap_http.Greeter; import org.apache.hello_world_soap_http.SOAPService; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java index 9d442de3f505b..793444e2d0839 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.interceptor.Fault; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringRouterTest.java index eac96de1a9a4d..2760676b0b547 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringRouterTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSpringRouterTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.frontend.ClientProxyFactoryBean; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java index 38e4e3b27609b..29b56a394a6e1 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxws.CxfConfigurer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/converter/PayLoadConvertToPOJOTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/converter/PayLoadConvertToPOJOTest.java index 2db79cf999aec..c48b51f890a0f 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/converter/PayLoadConvertToPOJOTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/converter/PayLoadConvertToPOJOTest.java @@ -23,7 +23,7 @@ import org.apache.camel.non_wrapper.Person; import org.apache.camel.non_wrapper.types.GetPerson; import org.apache.camel.non_wrapper.types.GetPersonResponse; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java index 5d09bcbc80103..760d761d0743e 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.hello_world_soap_http.Greeter; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java index b606964545e88..ccd525c0b2615 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java @@ -35,7 +35,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.cxf.mtom_feature.Hello; import org.apache.camel.cxf.mtom_feature.HelloService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.endpoint.Client; import org.apache.cxf.ext.logging.LoggingInInterceptor; import org.apache.cxf.ext.logging.LoggingOutInterceptor; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java index 9a93c27bf89c5..1da02466d05bb 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java @@ -25,7 +25,7 @@ import org.apache.camel.cxf.multipart.MultiPartInvoke; import org.apache.camel.cxf.multipart.types.InE; import org.apache.camel.cxf.multipart.types.ObjectFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamTest.java index f03b5dfa4b09e..2462bb20e4dc2 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamTest.java @@ -18,7 +18,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java index e34fbe0927add..96ec9a7752bab 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.cxf.HelloServiceImpl; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ServerFactoryBean; import org.junit.jupiter.api.Test; @@ -30,7 +30,7 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java index 3bed346b57014..4184a50ea351c 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.support.jsse.SSLContextParameters; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java index 93be4a0687c24..74a1ce6132328 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java index 902970d98bb9c..c47b1e57c02df 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.cxf.jaxws.CxfEndpoint; import org.apache.camel.component.cxf.spring.jaxws.CxfSpringEndpoint; import org.apache.camel.component.cxf.spring.jaxws.CxfSpringEndpointUtils; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderTest.java index 7a840d0d97019..6fb1abce1b45e 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.component.cxf.common.CXFTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java index f18296f3d0a53..665a7e4fb4320 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.cxf.wssecurity.server.CxfServer; import org.apache.camel.hello_world_soap_http.Greeter; import org.apache.camel.hello_world_soap_http.GreeterService; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; diff --git a/components/camel-cxf/camel-cxf-spring-transport/pom.xml b/components/camel-cxf/camel-cxf-spring-transport/pom.xml index 7efc8cfb653ae..e14d1eafc78dc 100644 --- a/components/camel-cxf/camel-cxf-spring-transport/pom.xml +++ b/components/camel-cxf/camel-cxf-spring-transport/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java index baa955eadb832..ddf07cc81cc68 100644 --- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java +++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.message.Exchange; diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java index 3bedfd2c8c935..f72e2c66c60eb 100644 --- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java +++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.jaxws.EndpointImpl; diff --git a/components/camel-cxf/camel-cxf-transport/pom.xml b/components/camel-cxf/camel-cxf-transport/pom.xml index 8b060c257b0dd..ceb9e00547797 100644 --- a/components/camel-cxf/camel-cxf-transport/pom.xml +++ b/components/camel-cxf/camel-cxf-transport/pom.xml @@ -79,7 +79,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java index 090dfc873f45e..029a1118367a6 100644 --- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java +++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.message.Exchange; diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java index 3bedfd2c8c935..f72e2c66c60eb 100644 --- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java +++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.jaxws.EndpointImpl; diff --git a/components/camel-cyberark-vault/pom.xml b/components/camel-cyberark-vault/pom.xml index 1f640edf0091e..7ce0e497650c0 100644 --- a/components/camel-cyberark-vault/pom.xml +++ b/components/camel-cyberark-vault/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultMultipleSecretsIT.java b/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultMultipleSecretsIT.java index 49962e0b3992a..36ec414e344a2 100644 --- a/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultMultipleSecretsIT.java +++ b/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultMultipleSecretsIT.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultProducerIT.java b/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultProducerIT.java index f39c71d8e8f1a..0237c6c45b291 100644 --- a/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultProducerIT.java +++ b/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultProducerIT.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cyberark.vault.CyberArkVaultConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultPropertiesSourceIT.java b/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultPropertiesSourceIT.java index e66ba71298435..856fb6b746116 100644 --- a/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultPropertiesSourceIT.java +++ b/components/camel-cyberark-vault/src/test/java/org/apache/camel/component/cyberark/vault/integration/CyberArkVaultPropertiesSourceIT.java @@ -28,7 +28,7 @@ import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; diff --git a/components/camel-dapr/pom.xml b/components/camel-dapr/pom.xml index 3f48f2823c2bb..6d1646f13f2b2 100644 --- a/components/camel-dapr/pom.xml +++ b/components/camel-dapr/pom.xml @@ -75,7 +75,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprComponentTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprComponentTest.java index d543a9ff8546c..041dd3b22ff38 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprComponentTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.dapr; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprConfigurationOptionsProxyTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprConfigurationOptionsProxyTest.java index 55169bae8cdcd..1f18a883635da 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprConfigurationOptionsProxyTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/DaprConfigurationOptionsProxyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprConfigurationConsumerTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprConfigurationConsumerTest.java index 544d21b7936fe..7fe2ac23d2b89 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprConfigurationConsumerTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprConfigurationConsumerTest.java @@ -33,7 +33,7 @@ import org.apache.camel.component.dapr.DaprEndpoint; import org.apache.camel.spi.ExchangeFactory; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprPubSubConsumerTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprPubSubConsumerTest.java index 351b564a37744..36d3a9e24cdec 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprPubSubConsumerTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/consumer/DaprPubSubConsumerTest.java @@ -35,7 +35,7 @@ import org.apache.camel.component.dapr.DaprEndpoint; import org.apache.camel.spi.ExchangeFactory; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprConfigurationTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprConfigurationTest.java index 5356ce4b02519..42f198319bf97 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprConfigurationTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprConfigurationTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.dapr.DaprEndpoint; import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeBindingTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeBindingTest.java index 93f4a7a90ed5d..34d5eec8be155 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeBindingTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeBindingTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.dapr.DaprEndpoint; import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeServiceTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeServiceTest.java index 826c65613f3c9..c9ea9351e3f16 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeServiceTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprInvokeServiceTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.dapr.DaprEndpoint; import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprLockTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprLockTest.java index 13e41d8e6aaf4..1bc632037bf52 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprLockTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprLockTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.component.dapr.LockOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprPubSubTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprPubSubTest.java index 7001b28b942ab..9bba342809e2e 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprPubSubTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprPubSubTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.dapr.DaprEndpoint; import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprSecretTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprSecretTest.java index cde17c4cdbb0b..33010530dde51 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprSecretTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprSecretTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.dapr.DaprEndpoint; import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprStateTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprStateTest.java index b3cbd0975912c..58e62682139e4 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprStateTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprStateTest.java @@ -36,7 +36,7 @@ import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.component.dapr.StateOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprWorkflowTest.java b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprWorkflowTest.java index 780f87ff24636..bc55dd89c6113 100644 --- a/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprWorkflowTest.java +++ b/components/camel-dapr/src/test/java/org/apache/camel/component/dapr/operations/DaprWorkflowTest.java @@ -35,7 +35,7 @@ import org.apache.camel.component.dapr.DaprOperation; import org.apache.camel.component.dapr.WorkflowOperation; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-datasonnet/pom.xml b/components/camel-datasonnet/pom.xml index d9a557886ab1f..aee11fc9072b9 100644 --- a/components/camel-datasonnet/pom.xml +++ b/components/camel-datasonnet/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java index fe72518cdfce7..abc6e6df966af 100644 --- a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java +++ b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; diff --git a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java index 3b0251cda8832..5b2056e19f629 100644 --- a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java +++ b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java @@ -26,7 +26,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; diff --git a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/DatasonnetAnnotationTest.java b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/DatasonnetAnnotationTest.java index 0fec292e8c807..3955eec4fc29e 100644 --- a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/DatasonnetAnnotationTest.java +++ b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/DatasonnetAnnotationTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DatasonnetAnnotationTest extends CamelTestSupport { diff --git a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/ExpressionsInJavaTest.java b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/ExpressionsInJavaTest.java index ce21eaf1350f7..bb29790b6c4ac 100644 --- a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/ExpressionsInJavaTest.java +++ b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/ExpressionsInJavaTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/PropertiesTest.java b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/PropertiesTest.java index 7b856b42719e3..92ecccde81291 100644 --- a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/PropertiesTest.java +++ b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/PropertiesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class PropertiesTest extends CamelTestSupport { diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/pom.xml b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/pom.xml index 40b956630dafe..6c6c6dad5c568 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/pom.xml +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java index 8c51f81968b95..5f9f4f007d127 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumComponentTest.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.camel.component.debezium.configuration.FileConnectorEmbeddedDebeziumConfiguration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java index ebd9947418fa9..6f37eb4aa304f 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java @@ -32,7 +32,7 @@ import org.apache.camel.component.debezium.configuration.EmbeddedDebeziumConfiguration; import org.apache.camel.component.debezium.configuration.FileConnectorEmbeddedDebeziumConfiguration; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml index effbbde093cbc..e9c871b23769f 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-debezium/camel-debezium-db2/pom.xml b/components/camel-debezium/camel-debezium-db2/pom.xml index 85ac7b8a4bcd0..3b3e1507e6e9e 100644 --- a/components/camel-debezium/camel-debezium-db2/pom.xml +++ b/components/camel-debezium/camel-debezium-db2/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-debezium/camel-debezium-mongodb/pom.xml b/components/camel-debezium/camel-debezium-mongodb/pom.xml index 4e5f50bdad4c7..743742a390171 100644 --- a/components/camel-debezium/camel-debezium-mongodb/pom.xml +++ b/components/camel-debezium/camel-debezium-mongodb/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-debezium/camel-debezium-mysql/pom.xml b/components/camel-debezium/camel-debezium-mysql/pom.xml index 80b7b01ae289d..239cd210cfbea 100644 --- a/components/camel-debezium/camel-debezium-mysql/pom.xml +++ b/components/camel-debezium/camel-debezium-mysql/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-debezium/camel-debezium-oracle/pom.xml b/components/camel-debezium/camel-debezium-oracle/pom.xml index 296c9eafc9cf8..74b9ef3156d36 100644 --- a/components/camel-debezium/camel-debezium-oracle/pom.xml +++ b/components/camel-debezium/camel-debezium-oracle/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-debezium/camel-debezium-postgres/pom.xml b/components/camel-debezium/camel-debezium-postgres/pom.xml index 1125ec31ce009..3a0f84986ec96 100644 --- a/components/camel-debezium/camel-debezium-postgres/pom.xml +++ b/components/camel-debezium/camel-debezium-postgres/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-debezium/camel-debezium-sqlserver/pom.xml b/components/camel-debezium/camel-debezium-sqlserver/pom.xml index fe52b9216d8d1..b8f4d47898473 100644 --- a/components/camel-debezium/camel-debezium-sqlserver/pom.xml +++ b/components/camel-debezium/camel-debezium-sqlserver/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-dfdl/pom.xml b/components/camel-dfdl/pom.xml index 21e7f0b329d28..8f9c92badbe85 100644 --- a/components/camel-dfdl/pom.xml +++ b/components/camel-dfdl/pom.xml @@ -39,6 +39,11 @@ org.apache.camel camel-support + + org.apache.daffodil + daffodil-sapi_2.12 + ${daffodil-version} + org.apache.daffodil daffodil-japi_2.12 @@ -52,7 +57,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-dfdl/src/test/java/org/apache/camel/component/dfdl/DfdlComponentTest.java b/components/camel-dfdl/src/test/java/org/apache/camel/component/dfdl/DfdlComponentTest.java index 3083062855c93..787fd6ad0e928 100644 --- a/components/camel-dfdl/src/test/java/org/apache/camel/component/dfdl/DfdlComponentTest.java +++ b/components/camel-dfdl/src/test/java/org/apache/camel/component/dfdl/DfdlComponentTest.java @@ -27,7 +27,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.daffodil.japi.Diagnostic; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-dfdl/src/test/java/org/apache/camel/dataformat/dfdl/DfdlDataFormatTest.java b/components/camel-dfdl/src/test/java/org/apache/camel/dataformat/dfdl/DfdlDataFormatTest.java index 2fdbc5026aa8d..817a28890411d 100644 --- a/components/camel-dfdl/src/test/java/org/apache/camel/dataformat/dfdl/DfdlDataFormatTest.java +++ b/components/camel-dfdl/src/test/java/org/apache/camel/dataformat/dfdl/DfdlDataFormatTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.dfdl.DfdlParseException; import org.apache.camel.component.dfdl.DfdlUnparseException; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.daffodil.japi.Diagnostic; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java index 079111b773046..9294d9644cb74 100644 --- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java +++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/AbstractDhis2TestSupport.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-dhis2/pom.xml b/components/camel-dhis2/pom.xml index c4ff61d35965d..8c0c33dfbcc87 100644 --- a/components/camel-dhis2/pom.xml +++ b/components/camel-dhis2/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-digitalocean/pom.xml b/components/camel-digitalocean/pom.xml index d485021eca6f0..08f905dba1b39 100644 --- a/components/camel-digitalocean/pom.xml +++ b/components/camel-digitalocean/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java index c8891ebab531b..722d5047d6488 100644 --- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java +++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java @@ -25,10 +25,10 @@ import org.apache.camel.component.digitalocean.constants.DigitalOceanHeaders; import org.apache.camel.component.digitalocean.constants.DigitalOceanOperations; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class DigitalOceanComponentTest extends CamelTestSupport { diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java index 8525c57df845d..68efc63f24323 100644 --- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java +++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java index f713434804a0b..e82df2c927ed7 100644 --- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java +++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java @@ -18,8 +18,8 @@ import java.util.Properties; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-disruptor/pom.xml b/components/camel-disruptor/pom.xml index 5c3b69c1bbba4..d42e34339d533 100644 --- a/components/camel-disruptor/pom.xml +++ b/components/camel-disruptor/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java index 4a106b9e17728..7d497f0a34aa7 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java index dbf41f2ba4842..a89e188e95361 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java @@ -19,7 +19,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java index 36018f8378834..4d7c430faafc0 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java index a7d2031c01aff..8e12873ea07f6 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java index cd88b33e2fa29..a142ce8947cc6 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java index 0d3430f98a05d..ea217aaf2d070 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java index 33e7e59ea9b4c..3185a17bc423b 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComponentReferenceEndpointTest.java @@ -19,7 +19,7 @@ import java.util.Iterator; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java index 1f04ecbc34cc7..7304a7360260b 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.RouteController; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java index b3980b32964ac..c6f4c4d48d12f 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DisruptorConcurrentConsumersTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java index 8adee44e255a3..6fe36e9ab7034 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.engine.DefaultProducerTemplate; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java index a06944f0a2bb5..6c5c53a69c748 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConfigureTest.java @@ -18,7 +18,7 @@ import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.WaitForTaskToComplete; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java index 060c34f6501ca..bb8c29e3a7061 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java index 90821dacf63f8..412239338fa74 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java index 0f20bdb89d84f..065fa6bf8ad8f 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DisruptorInOnlyChainedTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java index fce36fb224fc5..898f407dda64b 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DisruptorInOnlyTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java index f35d43e227feb..6cc29e04a2559 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java index 5171b61d0a748..36f8ae2e7239e 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java index 83e23c2876dd6..95b4e1d76d022 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTimeoutTest.java @@ -19,11 +19,11 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.ExchangeTimedOutException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java index a0f1f89a2027b..8d2c98eaf6892 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.SynchronizationAdapter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java index 197cc834a33da..51a2e32e49946 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java index bb3739a935980..1ae4f616d4a19 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DisruptorInOutWithErrorDeadLetterChannelTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java index 863a525ba6ddc..a2521c8617130 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java @@ -19,10 +19,10 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java index af853f0cdfb72..bedac8429573c 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DisruptorMultipleConsumersTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java index 12bfb0e9193e4..51bfdaf9ca762 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorNoConsumerTest.java @@ -19,10 +19,10 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.ExchangeTimedOutException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java index c31c59afe069b..935ea8502a4e6 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java index 3e66bc9688677..a15dc73f03816 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DisruptorRemoveRouteThenAddAgainTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java index cf52b7f607be1..392911510637d 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorRingBufferTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DisruptorRingBufferTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java index dbd7e3494ff99..cf390aac29a1e 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotSame; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java index 2b262d9360ae7..5e1985215c22e 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutDisabledTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java index fe88d772db41d..c743622b3da27 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java @@ -24,10 +24,10 @@ import org.apache.camel.ExchangeTimedOutException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java index dce3a8c14f7cc..40ff677f435c2 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Synchronization; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java index 13fae60c5dd3c..dc903862b86dc 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java index 4a6d2f9dc96f6..60ced3390feee 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.WaitForTaskToComplete; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java index 74558d17069aa..39bdd86c61cbd 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.SynchronizationAdapter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java index d027647a2e57f..2bb7a15c42567 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java index 2be4d0465bcaf..13f8b29f60916 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java index 934eada31b627..465fd765747ca 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.SynchronizationAdapter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java index aeae9eba68c43..f0922495af928 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java index 2452d34efb751..524ce3e119540 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java @@ -20,10 +20,10 @@ import org.apache.camel.ShutdownRunningTask; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; public class FileDisruptorShutdownCompleteAllTasksTest extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java index 1e132107fa267..dad0843baeb60 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ShutdownRoute; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java index 510004af0afd7..031420a92d06d 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/AbstractVmTestSupport.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public abstract class AbstractVmTestSupport extends CamelTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java index 65f34cf09d44f..1e2fefd305a8e 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.disruptor.DisruptorComponent; import org.apache.camel.component.disruptor.DisruptorReference; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java index 972bfd74c8c21..9e95b8456ab23 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; public class DisruptorVmInOnlyChainedTest extends AbstractVmTestSupport { diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java index efac27b91d76b..e62737de90d6b 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java index 26f6dae3eb169..4f4eb94d8ff63 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java @@ -22,7 +22,7 @@ import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java index 40116a16821a0..a7104e32e1250 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java index aa41f54c1b491..f687f6e5c325b 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java @@ -19,7 +19,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java index db26f288a2e36..a51e676291b12 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java index 107fe293e8649..b40417570c03a 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java @@ -19,10 +19,10 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml index 587f800809f80..f1e8a78cb07a6 100644 --- a/components/camel-dns/pom.xml +++ b/components/camel-dns/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java index f588f338bd4f1..d30cbd895f88b 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java index 31147173449de..be6e1bc1f61e9 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.xbill.DNS.Message; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java index e526b243bc1eb..ef0a9f7b006da 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java index 41be3b617ab97..09c1e4bfe4018 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java index cdaa093ed8214..833ec5eb1d26f 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java index 715825753a48c..de583d088bf27 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java index 500a8e0e0b159..d522eae5c40ed 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.xbill.DNS.Record; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java index 51342d45a0f6b..a5bfa200e4abc 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java index 717b685c89532..3d7e2dee1a2f3 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml index 4ba2aff766559..b6451368f0518 100644 --- a/components/camel-docker/pom.xml +++ b/components/camel-docker/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java index 338c459786116..7ae455377ac8a 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.docker.DockerConfiguration; import org.apache.camel.component.docker.util.DockerTestUtils; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java index 23a6f8938586b..ae84e107d8c42 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.docker.DockerConfiguration; import org.apache.camel.component.docker.util.DockerTestUtils; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java index 241ef5784c1c9..e6a0cbb340639 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.docker.DockerConfiguration; import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java index 03c0fa2ba5367..f68fa17f25ca7 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java @@ -24,8 +24,8 @@ import org.apache.camel.component.docker.DockerComponent; import org.apache.camel.component.docker.DockerConfiguration; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; public class DockerITTestSupport extends CamelTestSupport { diff --git a/components/camel-drill/pom.xml b/components/camel-drill/pom.xml index 3e24933646685..af7faff47b038 100644 --- a/components/camel-drill/pom.xml +++ b/components/camel-drill/pom.xml @@ -68,7 +68,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 true test diff --git a/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java b/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java index ac8c8a22ab32e..905933be1b5a0 100644 --- a/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java +++ b/components/camel-drill/src/test/java/org/apache/camel/component/drill/EndpointTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.drill; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java index 7d661ed2af048..4dd3de02e3987 100644 --- a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java +++ b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml index 25138d0b8b073..82d3f0ee81d6b 100644 --- a/components/camel-dropbox/pom.xml +++ b/components/camel-dropbox/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java index 33bb0b5acd2ae..07fa329d48020 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.dropbox.integration.consumer.DropboxScheduledPollGetConsumer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java index 4475ddcae6939..0d6f485f01990 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java @@ -27,8 +27,8 @@ import com.dropbox.core.oauth.DbxCredential; import com.dropbox.core.v2.DbxClientV2; import com.dropbox.core.v2.files.FileMetadata; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-dynamic-router/pom.xml b/components/camel-dynamic-router/pom.xml index 8a382d2463baa..2d1654cfdea58 100644 --- a/components/camel-dynamic-router/pom.xml +++ b/components/camel-dynamic-router/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterJmxIT.java b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterJmxIT.java index f9874dceb1bf1..d8e652a80d6c2 100644 --- a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterJmxIT.java +++ b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterJmxIT.java @@ -37,8 +37,8 @@ import org.apache.camel.component.dynamicrouter.filter.PrioritizedFilterStatistics; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.PredicateBuilder; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.DisableJmx; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.DisableJmx; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; diff --git a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterMultipleRecipientModeIT.java b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterMultipleRecipientModeIT.java index 17c47e08950f2..fc0b4cfa84af4 100644 --- a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterMultipleRecipientModeIT.java +++ b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterMultipleRecipientModeIT.java @@ -26,7 +26,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; diff --git a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterSingleRouteTwoParticipantsIT.java b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterSingleRouteTwoParticipantsIT.java index 94e79fc8cd3b3..d68a4d56b6412 100644 --- a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterSingleRouteTwoParticipantsIT.java +++ b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterSingleRouteTwoParticipantsIT.java @@ -27,7 +27,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.Builder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterTwoRoutesIT.java b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterTwoRoutesIT.java index 02b319f7d1a10..88ab5cd1a5ff1 100644 --- a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterTwoRoutesIT.java +++ b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/integration/DynamicRouterTwoRoutesIT.java @@ -26,7 +26,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; diff --git a/components/camel-ehcache/pom.xml b/components/camel-ehcache/pom.xml index aad411d583761..c6ae523faf3ec 100644 --- a/components/camel-ehcache/pom.xml +++ b/components/camel-ehcache/pom.xml @@ -61,12 +61,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java index 9991b34b63d13..d410910f2db0f 100644 --- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java +++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.ehcache.Cache; import org.ehcache.CacheManager; import org.ehcache.UserManagedCache; diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java index 5824e412b6f4f..17ec1e07402e4 100644 --- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java +++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Component; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.ehcache.Cache; import org.ehcache.config.ResourcePools; import org.ehcache.config.ResourceType; diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java index fe65658ff4f72..6af9c438adaea 100644 --- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java +++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Component; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.ehcache.Cache; import org.ehcache.config.CacheRuntimeConfiguration; import org.ehcache.config.ResourceType; diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheSpringConfigurationTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheSpringConfigurationTest.java index 91c41370cf186..44f57399fb2dc 100644 --- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheSpringConfigurationTest.java +++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheSpringConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.ehcache; import org.apache.camel.EndpointInject; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.ehcache.Cache; import org.ehcache.config.ResourcePools; import org.ehcache.config.ResourceType; diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java index 8d6a33232a47b..9c8e12685b40e 100644 --- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java +++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java @@ -28,7 +28,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.component.ehcache.processor.aggregate.EhcacheAggregationRepository; import org.apache.camel.support.DefaultExchangeHolder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.ehcache.Cache; import org.ehcache.CacheManager; import org.ehcache.config.Configuration; diff --git a/components/camel-elasticsearch-rest-client/pom.xml b/components/camel-elasticsearch-rest-client/pom.xml index 24293538e714d..4649b85d56c19 100644 --- a/components/camel-elasticsearch-rest-client/pom.xml +++ b/components/camel-elasticsearch-rest-client/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/ElasticSearchRestClientComponentConfigurationTest.java b/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/ElasticSearchRestClientComponentConfigurationTest.java index 01e1e38a38b9b..55940c706d6aa 100644 --- a/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/ElasticSearchRestClientComponentConfigurationTest.java +++ b/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/ElasticSearchRestClientComponentConfigurationTest.java @@ -18,7 +18,7 @@ import java.io.IOException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.http.HttpHost; import org.elasticsearch.client.RestClient; import org.junit.jupiter.api.Test; diff --git a/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/integration/ElasticsearchRestClientITSupport.java b/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/integration/ElasticsearchRestClientITSupport.java index 17896993b66a6..246ac6ed24148 100644 --- a/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/integration/ElasticsearchRestClientITSupport.java +++ b/components/camel-elasticsearch-rest-client/src/test/java/org/apache/camel/component/elasticsearch/rest/client/integration/ElasticsearchRestClientITSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchService; import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml index dd0e1dfd556d5..21eff13ea258d 100644 --- a/components/camel-elasticsearch/pom.xml +++ b/components/camel-elasticsearch/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchBulkIT.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchBulkIT.java index a5bc39e2cbebb..ffb2b91164160 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchBulkIT.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchBulkIT.java @@ -40,7 +40,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchClusterIndexIT.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchClusterIndexIT.java index 193d6f1bc8aaa..58f6d4fb4f278 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchClusterIndexIT.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchClusterIndexIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.client.Request; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java index 9b419722c4dc7..ab0eb7388053d 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java @@ -26,8 +26,8 @@ import org.apache.camel.component.es.ElasticsearchComponent; import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchService; import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestNameExtension; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestNameExtension; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; diff --git a/components/camel-elytron/pom.xml b/components/camel-elytron/pom.xml index 43fc667e2af05..06dd680e8f8a6 100644 --- a/components/camel-elytron/pom.xml +++ b/components/camel-elytron/pom.xml @@ -92,12 +92,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java index 1f868a1fd3e4b..583c0b4e4f859 100644 --- a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java +++ b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.undertow.UndertowComponent; import org.apache.camel.component.undertow.spi.UndertowSecurityProvider; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.wildfly.security.WildFlyElytronBaseProvider; import org.wildfly.security.auth.permission.LoginPermission; diff --git a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java index 87dc061bb0356..7e30efc733acc 100644 --- a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java +++ b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java @@ -40,7 +40,7 @@ import org.wildfly.security.http.HttpConstants; import org.wildfly.security.http.bearer.WildFlyElytronHttpBearerProvider; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-exec/pom.xml b/components/camel-exec/pom.xml index 2050e285d580f..d7ceb8136559c 100644 --- a/components/camel-exec/pom.xml +++ b/components/camel-exec/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/DefaultExecBindingTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/DefaultExecBindingTest.java index d4250db038905..e408ed447f96c 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/DefaultExecBindingTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/DefaultExecBindingTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Component; import org.apache.camel.Exchange; import org.apache.camel.component.exec.impl.DefaultExecBinding; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java index ed4b050980162..8a48005fcaa6b 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecEndpointTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Component; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.UnsafeUriCharactersEncoder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java index 9c4aa2e875325..f6189b3cd4c61 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.exec.internal.ExecutableJavaProgram; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java index d2bb65378ad8d..0b47a2b2cd18a 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java @@ -34,7 +34,7 @@ import org.apache.camel.component.exec.internal.ExecutableJavaProgram; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecOutFileTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecOutFileTest.java index 3623c7242a366..a6e424b943a77 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecOutFileTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecOutFileTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Processor; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.AfterEach; diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecProducerTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecProducerTest.java index 1e6ec7f80ef59..5b454b5ab056e 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecProducerTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecProducerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.exec.impl.ExecCommandExecutorMock; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java index 91d595efffdbf..cafed7ef0b8f5 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecScriptTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.commons.exec.OS; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java index c488841cc0be9..7b59da8a0e097 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.exec.ExecResult; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Disabled; @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; import static org.apache.camel.component.exec.ExecTestUtils.buildJavaExecutablePath; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-fastjson/pom.xml b/components/camel-fastjson/pom.xml index cad37a579dff7..53ff7bcf49c8e 100644 --- a/components/camel-fastjson/pom.xml +++ b/components/camel-fastjson/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java b/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java index 68fa6ab904225..60133ec80c1bf 100644 --- a/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java +++ b/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml index 3e25aaac6d38f..8e35effb00e4e 100644 --- a/components/camel-fhir/camel-fhir-component/pom.xml +++ b/components/camel-fhir/camel-fhir-component/pom.xml @@ -144,13 +144,13 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java index 098865fca1cfe..25ff1069768e9 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.test.infra.fhir.services.FhirService; import org.apache.camel.test.infra.fhir.services.FhirServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.HumanName; import org.hl7.fhir.r4.model.Patient; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java index 0cd4bba4d2cde..227638d74e276 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataFormatTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.Base; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java index f40488aef9f28..4ca89097bb744 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.fhir.FhirJsonDataFormat; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java index 3ab6296a19266..b39e0ab3a2385 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataFormatTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.Base; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java index 16d9c6779bb08..2e4700a2a1dd0 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.fhir.FhirXmlDataFormat; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java index 37cd4bbe6a274..1d5cdf9d752b3 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.fhir.FhirDataFormat; import org.apache.camel.reifier.dataformat.DataFormatReifier; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.hl7.fhir.r4.model.IdType; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatDefaultConfigSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatDefaultConfigSpringTest.java index ec968dd5c9b53..ed0322d3474b3 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatDefaultConfigSpringTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatDefaultConfigSpringTest.java @@ -19,7 +19,7 @@ import ca.uhn.fhir.context.FhirVersionEnum; import org.apache.camel.CamelContext; import org.apache.camel.component.fhir.FhirDataFormat; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataFormatSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataFormatSpringTest.java index c357cbc96aafd..e88f3be830bcc 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataFormatSpringTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataFormatSpringTest.java @@ -22,7 +22,7 @@ import ca.uhn.fhir.context.FhirContext; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.Base; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataformatErrorHandlerSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataformatErrorHandlerSpringTest.java index 493db90c55f08..3b84fcaa29b48 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataformatErrorHandlerSpringTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirJsonDataformatErrorHandlerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataFormatSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataFormatSpringTest.java index bd724d2735950..7924e9f521116 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataFormatSpringTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataFormatSpringTest.java @@ -22,7 +22,7 @@ import ca.uhn.fhir.context.FhirContext; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.Base; diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java index 9195c4e646a51..db8f9dba93860 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-file-watch/pom.xml b/components/camel-file-watch/pom.xml index 232a8d032d0bb..db347bdbb6a64 100644 --- a/components/camel-file-watch/pom.xml +++ b/components/camel-file-watch/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTestBase.java b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTestBase.java index 93ecf80fc9616..1149bdfacba01 100644 --- a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTestBase.java +++ b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTestBase.java @@ -27,8 +27,8 @@ import org.apache.camel.Exchange; import org.apache.camel.component.file.watch.constants.FileEventEnum; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestNameExtension; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestNameExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/SpringFileWatcherTest.java b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/SpringFileWatcherTest.java index c5c7aa5127dc8..46fecb2bd0be0 100644 --- a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/SpringFileWatcherTest.java +++ b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/SpringFileWatcherTest.java @@ -23,7 +23,7 @@ import java.util.UUID; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml index 20e31686844cb..89f2702d3a49a 100644 --- a/components/camel-flatpack/pom.xml +++ b/components/camel-flatpack/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java index b72a610e2866f..5382c503aca2b 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowLongTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowLongTest.java index 9849cb87400bd..fa6bf37a9b681 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowLongTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowLongTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest.java index 2669f100199e0..e5ab5ae777dfa 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortTest.java index 019064aca3bf6..ed298ca806c32 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedErrorWithUnmarshalTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedErrorWithUnmarshalTest.java index 5996e593b2a1e..4b8b6869b88f1 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedErrorWithUnmarshalTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedErrorWithUnmarshalTest.java @@ -19,7 +19,7 @@ import net.sf.flatpack.DataSet; import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java index 5ae0706caf8df..1212622714dc8 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java index 1c3861d3cdc17..047ed37c057ff 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java index f80b566b4f6a0..0f5f03e0fe801 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowLongTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowLongTest.java index 76e3523edb0de..49dd5fa458a86 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowLongTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowLongTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest.java index bc517e967b8e4..b34be9451b2f0 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java index 3bdf6eff6590b..f18317c972350 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthAllowShortTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java index 93e70d7f7a173..165c8290b9eff 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java index f53e6d9aec830..ea813a6fff5fe 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDataSetListIteratorTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDataSetListIteratorTest.java index 1327216bbbd55..351dd86e6c6a1 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDataSetListIteratorTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDataSetListIteratorTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class FlatpackDataSetListIteratorTest extends CamelTestSupport { diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java index 747489d9e9ed3..dd63c8a5c13cc 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java index 36b9a0f015971..5e5e4520c04b1 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java index 760b093d8d300..192a3c97966c5 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java index 095032911e1bc..13b619e5f3c59 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java index 622e14b818f10..aef2c91443d2b 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java @@ -19,7 +19,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; import org.springframework.util.Assert; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java index 80ebf8b643a53..93fe83f36ba54 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.CastUtils; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/StreamedSplitTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/StreamedSplitTest.java index 4d14f27c30e5a..d1b71a00f2b06 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/StreamedSplitTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/StreamedSplitTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLNoSplitRowsTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLNoSplitRowsTest.java index 4b526bbf6c939..bdf28c046ece7 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLNoSplitRowsTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLNoSplitRowsTest.java @@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLSplitRowsTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLSplitRowsTest.java index f34810bd87550..70b46ab2d374a 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLSplitRowsTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/XMLSplitRowsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml index 153681663dd06..bc678acad4beb 100644 --- a/components/camel-flink/pom.xml +++ b/components/camel-flink/pom.xml @@ -102,7 +102,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamBatchProcessingIT.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamBatchProcessingIT.java index 28c40445dec24..7e850539198a6 100644 --- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamBatchProcessingIT.java +++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamBatchProcessingIT.java @@ -21,7 +21,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSource; diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java index cb25c080f640f..f326684c1036a 100644 --- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java +++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java @@ -20,7 +20,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.flink.api.common.RuntimeExecutionMode; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.streaming.api.datastream.DataStream; diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java index 9bcef953c8256..d7ddfefe30bc7 100644 --- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java +++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java index f47230c46bc90..dc992a28e2cc9 100644 --- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java +++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.flink.api.common.RuntimeExecutionMode; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.streaming.api.datastream.DataStream; diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/FlinkProducerTest.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/FlinkProducerTest.java index 42724f4dff8c3..28bc5402ccaae 100644 --- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/FlinkProducerTest.java +++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/FlinkProducerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.component.flink.annotations.AnnotatedDataSetCallback; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.operators.DataSource; diff --git a/components/camel-flowable/pom.xml b/components/camel-flowable/pom.xml index 56ff197f73d51..36f1fe34ec77f 100644 --- a/components/camel-flowable/pom.xml +++ b/components/camel-flowable/pom.xml @@ -45,7 +45,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-flowable/src/test/java/org/apache/camel/component/flowable/CamelFlowableTestCase.java b/components/camel-flowable/src/test/java/org/apache/camel/component/flowable/CamelFlowableTestCase.java index 1b12cdfb85708..ffc520856ea46 100644 --- a/components/camel-flowable/src/test/java/org/apache/camel/component/flowable/CamelFlowableTestCase.java +++ b/components/camel-flowable/src/test/java/org/apache/camel/component/flowable/CamelFlowableTestCase.java @@ -18,7 +18,7 @@ import java.util.List; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.flowable.engine.ProcessEngine; import org.flowable.engine.ProcessEngineConfiguration; import org.flowable.engine.RepositoryService; diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml index b05a7b8bca78f..f3abb6363d1ea 100644 --- a/components/camel-fop/pom.xml +++ b/components/camel-fop/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java index c2840db4add0c..576bd68bc1d92 100644 --- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java +++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java @@ -25,12 +25,12 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java index f0cca89bd760e..5d664a9cc548a 100644 --- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java +++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Producer; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pdfbox.Loader; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.io.RandomAccessReadBuffer; diff --git a/components/camel-fory/pom.xml b/components/camel-fory/pom.xml index d55f413cb0721..2654040a08386 100644 --- a/components/camel-fory/pom.xml +++ b/components/camel-fory/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-fory/src/test/java/org/apache/camel/component/fory/ForyTest.java b/components/camel-fory/src/test/java/org/apache/camel/component/fory/ForyTest.java index 2811f696e8c8a..cb4bd8a21d519 100644 --- a/components/camel-fory/src/test/java/org/apache/camel/component/fory/ForyTest.java +++ b/components/camel-fory/src/test/java/org/apache/camel/component/fory/ForyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ForyTest extends CamelTestSupport { diff --git a/components/camel-freemarker/pom.xml b/components/camel-freemarker/pom.xml index 506bb36c30907..a023df8f049b7 100644 --- a/components/camel-freemarker/pom.xml +++ b/components/camel-freemarker/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java index 3b01d905f579b..dcff4091331ab 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Processor; import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerBodyAsDomainObjectTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerBodyAsDomainObjectTest.java index 4d2f5b25f6121..f49b1b273d4a7 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerBodyAsDomainObjectTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerBodyAsDomainObjectTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java index 777e1939c8906..ebed20394b82b 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class FreemarkerConcurrentTest extends CamelTestSupport { diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java index f4eecac34f6e0..3e7081beaef9b 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java @@ -25,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerLetterTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerLetterTest.java index 68df8fccfd8c0..1ca4b2a626380 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerLetterTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerLetterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerOverrideHeaderTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerOverrideHeaderTest.java index 0a3e9a6510f18..88e088e40c6fd 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerOverrideHeaderTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerOverrideHeaderTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerRefTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerRefTest.java index a049fcddde942..0eb74d1515d99 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerRefTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerRefTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java index 4d3ed918c1ca6..33f1de225a764 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTemplateInHeaderTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTemplateInHeaderTest.java index b6d77fa326b22..278dc15a8f1a4 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTemplateInHeaderTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTemplateInHeaderTest.java @@ -24,10 +24,10 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertMessageBodyEquals; +import static org.apache.camel.test.junit6.TestSupport.assertMessageBodyEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java index dd72ce4886807..db3703ac551a8 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerValuesInPropertiesTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerValuesInPropertiesTest.java index f2eb68acb3af2..6aee2f0dd9b5d 100644 --- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerValuesInPropertiesTest.java +++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerValuesInPropertiesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class FreemarkerValuesInPropertiesTest extends CamelTestSupport { diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml index e5633ffa24e14..f45c6981a1bd4 100644 --- a/components/camel-ftp/pom.xml +++ b/components/camel-ftp/pom.xml @@ -63,7 +63,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java index de706a7d66243..befddfee93557 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class BaseServerTestSupport extends CamelTestSupport { protected static final String LS = System.lineSeparator(); diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java index 7d122e99fb665..60143cdd1aa19 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.net.ftp.FTPFile; import org.junit.jupiter.api.Test; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java index 572b68cd9433a..944980057b2c7 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.file.remote; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java index 780eeae6e70cd..74de97242d15e 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.file.remote; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java index efd173d0c1e5e..47c689976a0e4 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java @@ -24,7 +24,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.net.ftp.FTPClient; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java index dd3be1d6c4a6d..5d66fb8cafc12 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java index 114611d1a92fd..9d556b13196d3 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java @@ -16,8 +16,8 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpTempFileNameIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpTempFileNameIT.java index 96f2f19cef285..c086007816978 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpTempFileNameIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpTempFileNameIT.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java index 41a4e0133c6ef..7bd699e1ede0e 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java @@ -22,12 +22,12 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import static org.junit.jupiter.api.Assertions.assertTrue; public class FromFileToFtpDeleteIT extends FtpServerTestSupport { diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpConsumerTemplateRollbackIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpConsumerTemplateRollbackIT.java index 5d5e7d18c05d7..7bbf379c1e028 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpConsumerTemplateRollbackIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpConsumerTemplateRollbackIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.file.GenericFileOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpDirectoryToBinaryFilesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpDirectoryToBinaryFilesIT.java index a603c9895bd32..d2d486dbbd5b9 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpDirectoryToBinaryFilesIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpDirectoryToBinaryFilesIT.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpExclusiveReadNoneStrategyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpExclusiveReadNoneStrategyIT.java index 80e3ee2227e1e..8c3d08613c96f 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpExclusiveReadNoneStrategyIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpExclusiveReadNoneStrategyIT.java @@ -30,8 +30,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; /** diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java index c7b2f5c9ff85a..3545c75a4df50 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpNoFilesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpNoFilesIT.java index 23ff4f4803abe..048a177750093 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpNoFilesIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpNoFilesIT.java @@ -22,8 +22,8 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.awaitility.Awaitility.await; /** diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java index 150391008a4bc..d586746cbe10a 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileIT.java index c9f0b92f9622e..ca0c6bbe138ef 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileIT.java @@ -24,7 +24,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileNoBodyConversionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileNoBodyConversionIT.java index 606912173c0c0..4d387c056fa2e 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileNoBodyConversionIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToAsciiFileNoBodyConversionIT.java @@ -23,7 +23,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFileIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFileIT.java index cb98148f48023..d248fd7ea16ee 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFileIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFileIT.java @@ -24,7 +24,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFilesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFilesIT.java index 7ce8de9bf62ab..cfc256f5c77c3 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFilesIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToBinaryFilesIT.java @@ -24,7 +24,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToFileNoFileNameHeaderIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToFileNoFileNameHeaderIT.java index 8c8f472df9fc6..87deba9746239 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToFileNoFileNameHeaderIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpToFileNoFileNameHeaderIT.java @@ -23,7 +23,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpBrowsableEndpointIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpBrowsableEndpointIT.java index 04e2f1503a121..057500ebf6181 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpBrowsableEndpointIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpBrowsableEndpointIT.java @@ -26,9 +26,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java index 2d5de32ab5134..27ba8afd25506 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java @@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java index 36c950e4e33ce..3b0b126661cad 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java @@ -23,13 +23,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java index 423e54c908f35..97779b302596a 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java @@ -21,11 +21,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; /** * diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAutoCreateIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAutoCreateIT.java index a236068944bc1..f27012a753bbb 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAutoCreateIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAutoCreateIT.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import static org.apache.camel.test.junit5.TestSupport.assertDirectoryExists; +import static org.apache.camel.test.junit6.TestSupport.assertDirectoryExists; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java index 2b14942ffb493..b2b272fd078fc 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java @@ -26,13 +26,13 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryDirectIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryDirectIT.java index 88b80f57058b4..6af723934327f 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryDirectIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryDirectIT.java @@ -23,12 +23,12 @@ import org.apache.camel.Producer; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import static org.junit.jupiter.api.Assertions.assertTrue; public class FtpConsumerLocalWorkDirectoryDirectIT extends FtpServerTestSupport { diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java index 0a9a04ab10916..95e698b2cd5a9 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java @@ -26,13 +26,13 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryWorkOnPayloadIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryWorkOnPayloadIT.java index 9a9d11a6d0838..955e9606f119c 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryWorkOnPayloadIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryWorkOnPayloadIT.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; public class FtpConsumerLocalWorkDirectoryWorkOnPayloadIT extends FtpConsumerLocalWorkDirectoryIT { diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java index 5d62ef823ece5..7ff3fff9127e6 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; import static org.awaitility.Awaitility.await; /** diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java index d0e1e66c9dbb5..8a548f4a95eed 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertDirectoryEquals; +import static org.apache.camel.test.junit6.TestSupport.assertDirectoryEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java index 6308eb231c408..55e8859042b93 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import static org.awaitility.Awaitility.await; public class FtpConsumerPostProcessingOnDisconnectIT extends FtpServerTestSupport { diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java index e7a37acee78a6..e125e10e7808b 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertDirectoryEquals; +import static org.apache.camel.test.junit6.TestSupport.assertDirectoryEquals; import static org.awaitility.Awaitility.await; public class FtpConsumerRelativeFileNameIT extends FtpServerTestSupport { diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java index e9b09844b62c1..297614420c73e 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java @@ -22,13 +22,13 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; import static org.junit.jupiter.api.Assertions.assertTrue; public class FtpConsumerResumeDownloadIT extends FtpServerTestSupport { diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java index 8584d18fca5aa..5ac4f2e5e04f0 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java @@ -29,7 +29,7 @@ import org.apache.camel.support.service.ServiceSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyIT.java index 11ed1c0e87646..bcf901ac19618 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyIT.java @@ -20,8 +20,8 @@ import org.apache.camel.component.file.GenericFileOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDoneFileNameIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDoneFileNameIT.java index cc24307d362a1..f36d484d1bdac 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDoneFileNameIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDoneFileNameIT.java @@ -23,7 +23,7 @@ import org.apache.camel.ExpressionIllegalSyntaxException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerExpressionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerExpressionIT.java index 692de2795c2d5..a3b874e0652cb 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerExpressionIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerExpressionIT.java @@ -23,7 +23,7 @@ import org.apache.camel.BindToRegistry; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; /** * Unit test for FTP using expression (file language) diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java index fd4a8364b3711..48845bad37da3 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java index 9286a35de6052..c5f94965508ba 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerMoveExistingIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerMoveExistingIT.java index 9562f473ffb93..cec4de5ffefe7 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerMoveExistingIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerMoveExistingIT.java @@ -29,10 +29,10 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerRootFileExistFailIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerRootFileExistFailIT.java index 8f3ec5304721f..c7f81acbe6c58 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerRootFileExistFailIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerRootFileExistFailIT.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerTempFileExistIssueIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerTempFileExistIssueIT.java index 302d602af963c..44ad01a894560 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerTempFileExistIssueIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerTempFileExistIssueIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.file.GenericFileOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerToDMoveExistingIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerToDMoveExistingIT.java index 0eb4eeea3df35..d463c9e6a734d 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerToDMoveExistingIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerToDMoveExistingIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; /** * diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpReadLockNotStartedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpReadLockNotStartedIT.java index 7efa581ab2539..001904eca267a 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpReadLockNotStartedIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpReadLockNotStartedIT.java @@ -29,7 +29,7 @@ import org.apache.camel.component.file.strategy.GenericFileNoOpProcessStrategy; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpSimpleConsumeStreamingStepwiseIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpSimpleConsumeStreamingStepwiseIT.java index 19fc24a72159e..3e6cdbacbe7c5 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpSimpleConsumeStreamingStepwiseIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpSimpleConsumeStreamingStepwiseIT.java @@ -25,7 +25,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/RemoteFileProduceOverruleOnlyOnceIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/RemoteFileProduceOverruleOnlyOnceIT.java index 8ea7a08210b66..304a86ef6831e 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/RemoteFileProduceOverruleOnlyOnceIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/RemoteFileProduceOverruleOnlyOnceIT.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpConsumerLocalWorkDirectoryIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpConsumerLocalWorkDirectoryIT.java index 6cee2024b3732..c8506625936a9 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpConsumerLocalWorkDirectoryIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpConsumerLocalWorkDirectoryIT.java @@ -27,13 +27,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.file.remote.sftp.integration.SftpServerTestSupport; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java index f508583a05ccb..44d2a51f1b013 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java @@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java index d45540326a12e..cd11ed630d0a4 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java @@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java index bf821daf6eb63..26c60663583a1 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java index 5dd8eb36fc12b..56b315abbf97c 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java @@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java index 5c5ddc8cbc803..0b6125c905ca5 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java @@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java index 3cc7125b60b2c..4f03a33335dba 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java index 5d4d7d2acc60f..6a4e55d1816f8 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java @@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java index a90ebb178b2fc..d9bb45d69c8aa 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java @@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java index 3c16c393a2b5a..9e251256a2fd9 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java @@ -21,14 +21,14 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @EnabledIf(value = "org.apache.camel.test.infra.ftp.services.embedded.SftpUtil#hasRequiredAlgorithms('src/test/resources/hostkey.pem')") diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java index 96c6bc6e7eefd..d18d0c514dd90 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java @@ -23,10 +23,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.createCleanDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.createCleanDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-geocoder/pom.xml b/components/camel-geocoder/pom.xml index c098f2ffe4431..8269b8ae6a11a 100644 --- a/components/camel-geocoder/pom.xml +++ b/components/camel-geocoder/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java index c0a6ccf968f12..69f59dd4b617c 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderApiKeyTestBase.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.geocoder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class GeoCoderApiKeyTestBase extends CamelTestSupport { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java index 6224dd1a362e5..6294366c113a8 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimAddressTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class GeoCoderNominatimAddressTest extends CamelTestSupport { diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java index 0315d054af9fe..3a1790fa175d1 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderNominatimTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class GeoCoderNominatimTest extends CamelTestSupport { diff --git a/components/camel-git/pom.xml b/components/camel-git/pom.xml index afecb956621c4..b89778259acab 100644 --- a/components/camel-git/pom.xml +++ b/components/camel-git/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java index 0b47ca4c68dd4..5b4c1af422450 100644 --- a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java +++ b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java @@ -19,7 +19,7 @@ import java.io.File; import java.util.UUID; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; @@ -27,7 +27,7 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder; import org.eclipse.jgit.util.SystemReader; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; public class GitTestSupport extends CamelTestSupport { diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml index b0411b69d4131..8c452c5e81951 100644 --- a/components/camel-github/pom.xml +++ b/components/camel-github/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java b/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java index 5b8b6e91b12df..92cd0964d0baa 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java @@ -25,7 +25,7 @@ import org.apache.camel.component.github.services.MockPullRequestService; import org.apache.camel.component.github.services.MockRepositoryService; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-google/camel-google-bigquery/pom.xml b/components/camel-google/camel-google-bigquery/pom.xml index f2b21fbd11b18..679eaa00d7029 100644 --- a/components/camel-google/camel-google-bigquery/pom.xml +++ b/components/camel-google/camel-google-bigquery/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryITSupport.java b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryITSupport.java index 0050a1b63d4a0..674065ef068c6 100644 --- a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryITSupport.java +++ b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryITSupport.java @@ -41,8 +41,8 @@ import org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory; import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLComponent; import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLConfiguration; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java index 76bca55338795..fd5e93e53e719 100644 --- a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java +++ b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.google.bigquery.GoogleBigQueryConfiguration; import org.apache.camel.component.google.bigquery.GoogleBigQueryEndpoint; import org.apache.camel.component.google.bigquery.GoogleBigQueryProducer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import static org.mockito.Mockito.any; diff --git a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java index e05d002d26ef2..a266491937c36 100644 --- a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java +++ b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLComponent; import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java index 0a84b28acef26..696f9f6291c64 100644 --- a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java +++ b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLConfiguration; import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpoint; import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLProducer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/components/camel-google/camel-google-calendar/pom.xml b/components/camel-google/camel-google-calendar/pom.xml index e7e0c82ad5218..5f40274eed78d 100644 --- a/components/camel-google/camel-google-calendar/pom.xml +++ b/components/camel-google/camel-google-calendar/pom.xml @@ -134,7 +134,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java index df8e032ee9337..817f0961aaad1 100644 --- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java +++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java @@ -25,8 +25,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java index 3e2b13e1e71cd..89ceead5c8ef1 100644 --- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java +++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java @@ -22,8 +22,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-google/camel-google-drive/pom.xml b/components/camel-google/camel-google-drive/pom.xml index c5b38ecab503c..e3fd59b26aa7f 100644 --- a/components/camel-google/camel-google-drive/pom.xml +++ b/components/camel-google/camel-google-drive/pom.xml @@ -133,7 +133,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java index 1d8633de51fe7..173ee837c9e1f 100644 --- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java +++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java @@ -25,8 +25,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.TestInstance; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java index 047208d53996f..ec99adc322bdd 100644 --- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java +++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java index 68321f8ade6b8..ac713edbe0f39 100644 --- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java +++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java @@ -20,10 +20,10 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertTrue; public class GoogleDriveFilesConverterTest extends CamelTestSupport { diff --git a/components/camel-google/camel-google-functions/pom.xml b/components/camel-google/camel-google-functions/pom.xml index f807b8f4dacac..647fa29fb097b 100644 --- a/components/camel-google/camel-google-functions/pom.xml +++ b/components/camel-google/camel-google-functions/pom.xml @@ -82,7 +82,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/integration/GoogleCloudIT.java b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/integration/GoogleCloudIT.java index 8fb67bca7a9bf..640a0645d232c 100644 --- a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/integration/GoogleCloudIT.java +++ b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/integration/GoogleCloudIT.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.functions.GoogleCloudFunctionsConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java index 4f0cef1f382e4..9cbf4aec15d68 100644 --- a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java +++ b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java @@ -28,7 +28,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.google.functions.GoogleCloudFunctionsComponent; import org.apache.camel.component.google.functions.mock.MockCloudFunctionsService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsConfigurationTest.java b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsConfigurationTest.java index d0fc5d7f17566..682be2f189065 100644 --- a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsConfigurationTest.java +++ b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsConfigurationTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.google.functions.GoogleCloudFunctionsEndpoint; import org.apache.camel.component.google.functions.GoogleCloudFunctionsOperations; import org.apache.camel.component.google.functions.mock.MockCloudFunctionsService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml index e0385576542ea..059b132553ffe 100644 --- a/components/camel-google/camel-google-mail/pom.xml +++ b/components/camel-google/camel-google-mail/pom.xml @@ -143,7 +143,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java index e90c05002be3c..8d1d4263b530d 100644 --- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java +++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java @@ -23,8 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java index 774260d3338c4..c4680afd41800 100644 --- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java +++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/AbstractGoogleMailStreamTestSupport.java @@ -22,8 +22,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-google/camel-google-pubsub-lite/pom.xml b/components/camel-google/camel-google-pubsub-lite/pom.xml index 720e49d2f3e28..589bc161f6cdb 100644 --- a/components/camel-google/camel-google-pubsub-lite/pom.xml +++ b/components/camel-google/camel-google-pubsub-lite/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteComponentTest.java b/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteComponentTest.java index e6ef1841441d9..33968fb1e3324 100644 --- a/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteComponentTest.java +++ b/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteComponentTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteConsumerTest.java b/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteConsumerTest.java index 3e3744ebbda8b..aefb1d6cb8625 100644 --- a/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteConsumerTest.java +++ b/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteConsumerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteProducerTest.java b/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteProducerTest.java index bc1da31f5fc59..b0a60b1962537 100644 --- a/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteProducerTest.java +++ b/components/camel-google/camel-google-pubsub-lite/src/test/java/org/apache/camel/component/google/pubsublite/GooglePubsubLiteProducerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml index a92de7f906fc1..bc42418e330f7 100644 --- a/components/camel-google/camel-google-pubsub/pom.xml +++ b/components/camel-google/camel-google-pubsub/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java index 01acb43891bb1..96624e25b8a4a 100644 --- a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java +++ b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java @@ -40,8 +40,8 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.test.infra.google.pubsub.services.GooglePubSubService; import org.apache.camel.test.infra.google.pubsub.services.GooglePubSubServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-google/camel-google-secret-manager/pom.xml b/components/camel-google/camel-google-secret-manager/pom.xml index b9299c8f582cf..32021eda8699c 100644 --- a/components/camel-google/camel-google-secret-manager/pom.xml +++ b/components/camel-google/camel-google-secret-manager/pom.xml @@ -80,7 +80,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerIT.java b/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerIT.java index 085cb5d9cb312..cb8794d184eba 100644 --- a/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerIT.java +++ b/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerIT.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.secret.manager.GoogleSecretManagerConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerPropertiesNoEnvSourceTestIT.java b/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerPropertiesNoEnvSourceTestIT.java index 11e3637874bc8..a55118ece9bf4 100644 --- a/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerPropertiesNoEnvSourceTestIT.java +++ b/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleSecretManagerPropertiesNoEnvSourceTestIT.java @@ -19,7 +19,7 @@ import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/unit/GoogleSecretManagerConfigurationTest.java b/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/unit/GoogleSecretManagerConfigurationTest.java index 8bb4cd7237c96..11f3a4a66df2e 100644 --- a/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/unit/GoogleSecretManagerConfigurationTest.java +++ b/components/camel-google/camel-google-secret-manager/src/test/java/org/apache/camel/component/google/secret/manager/unit/GoogleSecretManagerConfigurationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.component.google.secret.manager.GoogleSecretManagerComponent; import org.apache.camel.component.google.secret.manager.GoogleSecretManagerEndpoint; import org.apache.camel.component.google.secret.manager.GoogleSecretManagerOperations; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-google/camel-google-sheets/pom.xml b/components/camel-google/camel-google-sheets/pom.xml index a745bc23ef9fb..1170f59dfd7a5 100644 --- a/components/camel-google/camel-google-sheets/pom.xml +++ b/components/camel-google/camel-google-sheets/pom.xml @@ -141,7 +141,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java index 9662dcaa752c1..e0742a6805ff5 100644 --- a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java +++ b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java @@ -28,7 +28,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.Component; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java index a7caecebd23ec..b9e24bd48fd6d 100644 --- a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java +++ b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection; import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsApiMethod; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-google/camel-google-storage/pom.xml b/components/camel-google/camel-google-storage/pom.xml index 1df225fe862eb..5838b61e8f968 100644 --- a/components/camel-google/camel-google-storage/pom.xml +++ b/components/camel-google/camel-google-storage/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/integration/ComplexIT.java b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/integration/ComplexIT.java index 8b52c0984facc..7c4d2df67ff8d 100644 --- a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/integration/ComplexIT.java +++ b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/integration/ComplexIT.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.storage.GoogleCloudStorageConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java index b713909168b84..10f1a257efe45 100644 --- a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java +++ b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.google.storage.GoogleCloudStorageComponent; import org.apache.camel.component.google.storage.localstorage.LocalStorageHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public abstract class GoogleCloudStorageBaseTest extends CamelTestSupport { diff --git a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageComponentConfigurationTest.java b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageComponentConfigurationTest.java index bf02279cd823a..626d1cab53dec 100644 --- a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageComponentConfigurationTest.java +++ b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageComponentConfigurationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.component.google.storage.GoogleCloudStorageComponent; import org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration; import org.apache.camel.component.google.storage.GoogleCloudStorageEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-google/camel-google-vertexai/pom.xml b/components/camel-google/camel-google-vertexai/pom.xml index eb86265b45365..68fe18e0cd7dc 100644 --- a/components/camel-google/camel-google-vertexai/pom.xml +++ b/components/camel-google/camel-google-vertexai/pom.xml @@ -96,7 +96,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/GoogleVertexAIComponentConfigurationTest.java b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/GoogleVertexAIComponentConfigurationTest.java index 5930899e87002..15384dd029ca4 100644 --- a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/GoogleVertexAIComponentConfigurationTest.java +++ b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/GoogleVertexAIComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.google.vertexai; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIIT.java b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIIT.java index 0b3c2e273cf2c..f395bf6053dec 100644 --- a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIIT.java +++ b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIIT.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.vertexai.GoogleVertexAIConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIRawPredictIT.java b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIRawPredictIT.java index e2279668ae662..88b9bdade59d8 100644 --- a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIRawPredictIT.java +++ b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIRawPredictIT.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.vertexai.GoogleVertexAIConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIWithSystemPropertiesIT.java b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIWithSystemPropertiesIT.java index 8593a65297087..b432db88246ca 100644 --- a/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIWithSystemPropertiesIT.java +++ b/components/camel-google/camel-google-vertexai/src/test/java/org/apache/camel/component/google/vertexai/integration/GoogleVertexAIWithSystemPropertiesIT.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml index 13157cbecb86b..0c388370b2a1b 100644 --- a/components/camel-grape/pom.xml +++ b/components/camel-grape/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-graphql/pom.xml b/components/camel-graphql/pom.xml index b38dbf76e49ba..37844f1f5826f 100644 --- a/components/camel-graphql/pom.xml +++ b/components/camel-graphql/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java index cc9bc7b325a01..9ff8f35595559 100644 --- a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java +++ b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.graphql.server.GraphqlServer; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.http.base.HttpOperationFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.json.JsonObject; diff --git a/components/camel-grok/pom.xml b/components/camel-grok/pom.xml index 5a88ba240d6b3..10015171babbd 100644 --- a/components/camel-grok/pom.xml +++ b/components/camel-grok/pom.xml @@ -47,7 +47,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java index e09f115ea0f0b..83163b3a5fb61 100644 --- a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java +++ b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokMarshalTest.java b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokMarshalTest.java index eaf20aeefe4ce..1270edccceeb7 100644 --- a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokMarshalTest.java +++ b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokMarshalTest.java @@ -19,10 +19,10 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; public class GrokMarshalTest extends CamelTestSupport { diff --git a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokOptionalOptionsTest.java b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokOptionalOptionsTest.java index eaa5a0836938c..46c82e00e87c6 100644 --- a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokOptionalOptionsTest.java +++ b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokOptionalOptionsTest.java @@ -24,10 +24,10 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokPatternsTest.java b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokPatternsTest.java index d63c3d7ea2ca3..b8e0393616bbc 100644 --- a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokPatternsTest.java +++ b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokPatternsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokUnmarshalTest.java b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokUnmarshalTest.java index fc180c8f14382..90b2c401db153 100644 --- a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokUnmarshalTest.java +++ b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokUnmarshalTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-grok/src/test/java/org/apache/camel/component/grok/SpringGrokDataFormatTest.java b/components/camel-grok/src/test/java/org/apache/camel/component/grok/SpringGrokDataFormatTest.java index f1f7ecfe9c41c..833ae4d9df663 100644 --- a/components/camel-grok/src/test/java/org/apache/camel/component/grok/SpringGrokDataFormatTest.java +++ b/components/camel-grok/src/test/java/org/apache/camel/component/grok/SpringGrokDataFormatTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-groovy-xml/pom.xml b/components/camel-groovy-xml/pom.xml index 251d382950159..4a452c009d4fe 100644 --- a/components/camel-groovy-xml/pom.xml +++ b/components/camel-groovy-xml/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-groovy-xml/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java b/components/camel-groovy-xml/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java index 9ebaecc933244..f92189c5efa28 100644 --- a/components/camel-groovy-xml/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java +++ b/components/camel-groovy-xml/src/test/java/org/apache/camel/groovy/xml/GroovyXmlDataFormatTest.java @@ -26,7 +26,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.json.JsonArray; import org.apache.camel.util.json.JsonObject; import org.junit.jupiter.api.Assertions; diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml index 9d74815c35f34..1d1b9a38befe5 100644 --- a/components/camel-groovy/pom.xml +++ b/components/camel-groovy/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java index ecd8fa9d8d232..0b7885f572b75 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java @@ -24,9 +24,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertExpression; -import static org.apache.camel.test.junit5.TestSupport.assertInMessageHeader; -import static org.apache.camel.test.junit5.TestSupport.assertPredicate; +import static org.apache.camel.test.junit6.TestSupport.assertExpression; +import static org.apache.camel.test.junit6.TestSupport.assertInMessageHeader; +import static org.apache.camel.test.junit6.TestSupport.assertPredicate; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java index 24af970a24725..69ba3fae6d00c 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class GroovyInvokeMethodTest extends CamelTestSupport { diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java index b49b2dda07505..ad56aedfc56a2 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java @@ -23,7 +23,7 @@ import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.attachment.CamelFileDataSource; import org.apache.camel.attachment.DefaultAttachment; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.codehaus.groovy.control.MultipleCompilationErrorsException; import org.junit.jupiter.api.Test; 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 7f72114ec9d0f..9717f131cc3fc 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 @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java index 0653a3c33b88d..70e05a6bc773b 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyScriptingLanguageTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyScriptingLanguageTest.java index 0e0ff9c7a165c..00837b16e9892 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyScriptingLanguageTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyScriptingLanguageTest.java @@ -21,7 +21,7 @@ import org.apache.camel.spi.Language; import org.apache.camel.spi.ScriptingLanguage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java index 585caa1891b9f..6f7e599b1a5f2 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.language.groovy.GroovyLanguage.groovy; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java index b3ed340b57255..47141e3c30e72 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class GroovySetHeaderTest extends CamelTestSupport { diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java index bd452e4d9d90e..701905e4e6bb8 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java @@ -26,8 +26,8 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.junit.jupiter.api.Test; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java index 3aad8eec24ac0..6752ebcd5287f 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class LanguageGroovyRouteTest extends CamelTestSupport { diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/DefaultGroovyCompilerTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/DefaultGroovyCompilerTest.java index 9a7ab445176cf..119a3064212b7 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/DefaultGroovyCompilerTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/DefaultGroovyCompilerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.language.groovy.DefaultGroovyScriptCompiler; import org.apache.camel.spi.CompileStrategy; import org.apache.camel.support.ObjectHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyCompilerRouteTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyCompilerRouteTest.java index 4a5df0ec11b6c..c30fca5f24208 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyCompilerRouteTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyCompilerRouteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.language.groovy.DefaultGroovyScriptCompiler; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class GroovyCompilerRouteTest extends CamelTestSupport { diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java index fc1b660bd7fff..594f6fa177086 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java @@ -17,7 +17,7 @@ package org.apache.camel.processor.groovy; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java index 8f21b2a214770..f0d0aa88bf938 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java index 928f730ae484f..c3c2a531dc847 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java index b91bdee85bba3..567b0b3235ef2 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class GroovySetHeaderIssueTest extends CamelTestSupport { diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java index f0b9b48f242fa..72be865d0ce86 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java index 7784372877bc2..196ef72b44dd1 100644 --- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java +++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java @@ -17,7 +17,7 @@ package org.apache.camel.processor.groovy; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml index 111774da6bcdb..f52e6da8700ba 100644 --- a/components/camel-grpc/pom.xml +++ b/components/camel-grpc/pom.xml @@ -106,7 +106,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java index 9f9b3d983cb11..38725b548d022 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java @@ -26,7 +26,7 @@ import io.grpc.stub.StreamObserver; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java index 3852c28719299..3aced7006cb7a 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java @@ -30,7 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConfigurationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConfigurationTest.java index b604e668bf3b7..16d7c8f151439 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConfigurationTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.grpc; import org.apache.camel.FailedToCreateConsumerException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java index a9fb3566d9ce1..8cc7728b39dc6 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java index ee300d2a2d548..476d39caa7610 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java index ff05503333312..1d1319d764d4f 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java @@ -35,7 +35,7 @@ import org.apache.camel.component.grpc.auth.jwt.JwtHelper; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java index 67e7a96b03a19..ce6ddf0197dff 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java @@ -23,7 +23,7 @@ import io.grpc.Server; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java index b40fed633805e..be515532e7e52 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java @@ -21,7 +21,7 @@ import io.grpc.stub.StreamObserver; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerConfigurationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerConfigurationTest.java index f42b64d1cf9cd..745c21ad8349b 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerConfigurationTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.grpc; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java index 902299137c9cc..91c229f05b10d 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.grpc.auth.jwt.JwtAlgorithm; import org.apache.camel.component.grpc.auth.jwt.JwtServerInterceptor; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java index bf29c449a1766..5fe989855a24a 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java index 99999e002f3df..4e14eb8ecc5a4 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java @@ -23,7 +23,7 @@ import io.grpc.stub.StreamObserver; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java index 9e57ddb907b7a..92d969f9e6be8 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java @@ -30,7 +30,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java index a2a8bab936316..98a99f291502f 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java @@ -30,7 +30,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java index 7f24234b2698c..26b50e91b6452 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java @@ -30,7 +30,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java index 98ab6bb3dc60f..6f39fea80f3b3 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java @@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-gson/pom.xml b/components/camel-gson/pom.xml index b7857857ae79d..94c6b7e6dd9e9 100644 --- a/components/camel-gson/pom.xml +++ b/components/camel-gson/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java index 21bbd4ee8e03a..b1a2de50db67e 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java @@ -23,10 +23,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class GsonConcurrentTest extends CamelTestSupport { diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonFieldNamePolicyTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonFieldNamePolicyTest.java index b9355522b8ce6..c6c21377ff9dd 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonFieldNamePolicyTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonFieldNamePolicyTest.java @@ -18,7 +18,7 @@ import com.google.gson.FieldNamingPolicy; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java index 417302ddad079..66169eaa32787 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.gson.annotation.ExcludeAge; import org.apache.camel.component.gson.annotation.ExcludeWeight; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java index de64db0d0b3f0..bae1ee5506ca4 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java @@ -23,7 +23,7 @@ import com.google.gson.reflect.TypeToken; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java index 953e262bd3cff..4acb14258c78f 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonUnmarshalTypeFromHeaderTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonUnmarshalTypeFromHeaderTest.java index c15f5e2f3322b..2885973311f70 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonUnmarshalTypeFromHeaderTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonUnmarshalTypeFromHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java index c689adfb85355..7b153a3844197 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.gson; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java index b52af5e9a7278..df81542c8c921 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java @@ -19,7 +19,7 @@ import java.text.SimpleDateFormat; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonUnmarshalTypeFromHeaderTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonUnmarshalTypeFromHeaderTest.java index aa6c7ee888d6d..82c3a60681008 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonUnmarshalTypeFromHeaderTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonUnmarshalTypeFromHeaderTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.gson; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-guava-eventbus/pom.xml b/components/camel-guava-eventbus/pom.xml index 53a7a112ceb44..306b5c6b76128 100644 --- a/components/camel-guava-eventbus/pom.xml +++ b/components/camel-guava-eventbus/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusComponentTest.java b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusComponentTest.java index a1ab6cdb3b7e4..e8b5dd88938b7 100644 --- a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusComponentTest.java +++ b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusComponentTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerConfigurationTest.java b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerConfigurationTest.java index f3149d297f7e9..7dbb5253384de 100644 --- a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerConfigurationTest.java +++ b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerConfigurationTest.java @@ -21,10 +21,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerTest.java b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerTest.java index ee9a029652baf..3ceb8c86dfd97 100644 --- a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerTest.java +++ b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumingDeadEventsTest.java b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumingDeadEventsTest.java index 874190355a2b2..f3b82fea42d9c 100644 --- a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumingDeadEventsTest.java +++ b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumingDeadEventsTest.java @@ -23,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducerTest.java b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducerTest.java index 0b4c34faf784c..f41984270f014 100644 --- a/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducerTest.java +++ b/components/camel-guava-eventbus/src/test/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducerTest.java @@ -20,7 +20,7 @@ import com.google.common.eventbus.Subscribe; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-hashicorp-vault/pom.xml b/components/camel-hashicorp-vault/pom.xml index 9d13a9b56924a..dd460d55bda9b 100644 --- a/components/camel-hashicorp-vault/pom.xml +++ b/components/camel-hashicorp-vault/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceNoEnvTestIT.java b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceNoEnvTestIT.java index c4d9117c138fa..dfbfc32c0e43d 100644 --- a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceNoEnvTestIT.java +++ b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/HashicorpVaultPropertiesSourceNoEnvTestIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpServiceFactory; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpVaultService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpVaultBase.java b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpVaultBase.java index 908bbc51ee99d..d5b97a156d5b7 100644 --- a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpVaultBase.java +++ b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpVaultBase.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpServiceFactory; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpVaultService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; public class HashicorpVaultBase extends CamelTestSupport { diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml index 9250dd7932d81..dfc3041074344 100644 --- a/components/camel-hazelcast/pom.xml +++ b/components/camel-hazelcast/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java index faa9a9040d95b..b34b6c6d2fff7 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java @@ -18,7 +18,7 @@ import com.hazelcast.core.HazelcastInstance; import org.apache.camel.CamelContext; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterEach; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java index c3b1df7563870..3ade4431e0253 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java @@ -18,7 +18,7 @@ import com.hazelcast.core.HazelcastInstance; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java index 8c58d1de4a209..6e0fa70e5005b 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java @@ -28,7 +28,7 @@ import org.apache.camel.test.infra.common.TestEntityNameGenerator; import org.apache.camel.test.infra.hazelcast.services.HazelcastService; import org.apache.camel.test.infra.hazelcast.services.HazelcastServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java index d27da655dcb55..047562447da62 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java index 3b92bd4d2000d..611dd058de7c9 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java @@ -19,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java index b1d43a68ccef1..123d4ab536fac 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java @@ -19,10 +19,10 @@ import org.apache.camel.PropertyBindingException; import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.component.hazelcast.seda.HazelcastSedaEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java index 74dbed2e23157..3e67fd742848a 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java @@ -22,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java index 0339a8ca2cfa7..14c1bb680e00a 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class HazelcastSedaInOnlyTest extends CamelTestSupport { diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java index c4f13dac6c4ea..6286a40344f6e 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java @@ -25,7 +25,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java index 0971b6d091fef..bcb72f4c89816 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java @@ -18,7 +18,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java index fe4e33309abc1..39b57e5c73bf9 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java @@ -26,7 +26,7 @@ import org.apache.camel.test.infra.common.TestEntityNameGenerator; import org.apache.camel.test.infra.hazelcast.services.HazelcastService; import org.apache.camel.test.infra.hazelcast.services.HazelcastServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java index 933588d862e99..f59fab144360c 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java @@ -30,7 +30,7 @@ import org.apache.camel.test.infra.common.TestEntityNameGenerator; import org.apache.camel.test.infra.hazelcast.services.HazelcastService; import org.apache.camel.test.infra.hazelcast.services.HazelcastServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java index 3c723013ab4a3..0be8909a8eca9 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java @@ -21,7 +21,7 @@ import org.apache.camel.test.infra.common.TestEntityNameGenerator; import org.apache.camel.test.infra.hazelcast.services.HazelcastService; import org.apache.camel.test.infra.hazelcast.services.HazelcastServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java index 86f1404ec9446..585d410827876 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java index 7b58532b04e9a..d142205d9d94a 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java index 37d826b1a6bc5..d6cd227dbabc8 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java @@ -25,7 +25,7 @@ import org.apache.camel.test.infra.common.TestEntityNameGenerator; import org.apache.camel.test.infra.hazelcast.services.HazelcastService; import org.apache.camel.test.infra.hazelcast.services.HazelcastServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-headersmap/pom.xml b/components/camel-headersmap/pom.xml index a86ed51811299..dc80bf29ca4ea 100644 --- a/components/camel-headersmap/pom.xml +++ b/components/camel-headersmap/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-headersmap/src/test/java/org/apache/camel/component/headersmap/CamelFastHeadersMapTest.java b/components/camel-headersmap/src/test/java/org/apache/camel/component/headersmap/CamelFastHeadersMapTest.java index b5be3a1c93965..9e08fb498145d 100644 --- a/components/camel-headersmap/src/test/java/org/apache/camel/component/headersmap/CamelFastHeadersMapTest.java +++ b/components/camel-headersmap/src/test/java/org/apache/camel/component/headersmap/CamelFastHeadersMapTest.java @@ -19,10 +19,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.HeadersMapFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; public class CamelFastHeadersMapTest extends CamelTestSupport { diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml index 2e22d41f9f9dd..c9dd418e6d444 100644 --- a/components/camel-hl7/pom.xml +++ b/components/camel-hl7/pom.xml @@ -112,7 +112,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java index 48ff9a4e8dc34..004a601fa0a71 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java @@ -23,7 +23,7 @@ import ca.uhn.hl7v2.model.v24.message.ADT_A01; import ca.uhn.hl7v2.model.v24.segment.PID; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.ack; diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java index b7053f5d4195c..a7f80845224ef 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.hl7; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.convertLFToCR; diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java index cd8838a94b0f7..ab9f54928d5aa 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java @@ -28,7 +28,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java index e92622598bc47..e4fcad2e7532f 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.component.hl7; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; public abstract class HL7TestSupport extends CamelTestSupport { diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java index 56f5495dc59de..8822b39d57c96 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java @@ -34,12 +34,12 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java index f739c4253f63c..37f7f4e1d22b7 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java @@ -25,7 +25,7 @@ import ca.uhn.hl7v2.validation.impl.NoValidation; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java index c64d2d47f25f5..1d5d9d4cfa856 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java @@ -28,7 +28,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.messageConforms; diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java index 945f03bf66b9c..994f80e42536d 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.hl7terser; diff --git a/components/camel-http-base/pom.xml b/components/camel-http-base/pom.xml index 5b37afdf6b5a7..a0bfbf75a2e1a 100644 --- a/components/camel-http-base/pom.xml +++ b/components/camel-http-base/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml index cb0f79810820a..0b28ecf7f405e 100644 --- a/components/camel-http-common/pom.xml +++ b/components/camel-http-common/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java b/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java index f535d5ea7cdd2..90e26a30d3cae 100644 --- a/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java +++ b/components/camel-http-common/src/test/java/org/apache/camel/http/common/DefaultHttpBindingTest.java @@ -20,7 +20,7 @@ import java.util.Locale; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java index 07a5804c77ef0..e37bcfd9d9409 100644 --- a/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java +++ b/components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHeaderFilterStrategyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java index c093f8128fc4b..89a08c3e317d7 100644 --- a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java +++ b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java @@ -30,7 +30,7 @@ import org.apache.camel.http.base.cookie.CookieHandler; import org.apache.camel.http.base.cookie.ExchangeCookieHandler; import org.apache.camel.http.base.cookie.InstanceCookieHandler; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index 2ec563b857a30..a25b4063b10aa 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -96,7 +96,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java index 042070ddd7a3a..23a3f81865b6e 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.http; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCredentialsHelperTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCredentialsHelperTest.java index 7e773bcdc3cbe..6fe8ef18e27e4 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCredentialsHelperTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCredentialsHelperTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.http; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.CredentialsProvider; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java index ecd07740546e1..7e33555160b73 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java index a0f9cee846f9f..8eb2494e5785f 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.component.http.HttpMethods.GET; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java index 509d9b0f33734..6f6e346e18857 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java @@ -20,10 +20,10 @@ import org.apache.camel.CamelContext; import org.apache.camel.http.base.HttpHeaderFilterStrategy; import org.apache.camel.http.common.DefaultHttpBinding; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; /** * Having custom endpoint options should not override or change any component configured options. diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointURLTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointURLTest.java index afbe996418fd4..7acf43fb2e57b 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointURLTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointURLTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.http; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.URISupport; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.http.io.HttpClientConnectionManager; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java index a336a78affaee..c44829162ebe6 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.http.common.HttpMethods.GET; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java index 4c8670d132ac6..2ad304f4e88e3 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import static org.apache.camel.http.common.HttpMethods.GET; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java index e4467b1926734..25bd6d162cb69 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.component.http.HttpMethods.GET; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java index 13be7733a8caa..024b3e97b73dc 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java @@ -26,7 +26,7 @@ import org.apache.camel.test.infra.jetty.services.JettyConfiguration; import org.apache.camel.test.infra.jetty.services.JettyConfigurationBuilder; import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.session.SessionHandler; import org.junit.jupiter.api.Test; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java index 8cda9b1f01310..41b5d6a34068e 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.http.common.DefaultHttpBinding; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.protocol.HttpContext; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSNIHostNameTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSNIHostNameTest.java index 8cc58ca9b5f82..0f0f492b1f8d0 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSNIHostNameTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSNIHostNameTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.http.base.HttpOperationFailedException; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java index 8df4d9ed17b06..7cbcb47cf5d07 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java @@ -18,7 +18,7 @@ import javax.net.ssl.SSLContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ConnectionReuseStrategy; import org.apache.hc.core5.http.HttpResponseFactory; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java index c030d515a7ff0..d3ae1d1e7e038 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.component.http.HttpMethods.GET; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpUseSystemPropertiesPropagationTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpUseSystemPropertiesPropagationTest.java index 4ef817ade7170..29b727d735244 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpUseSystemPropertiesPropagationTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpUseSystemPropertiesPropagationTest.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.params.ParameterizedTest; diff --git a/components/camel-huawei/camel-huaweicloud-dms/pom.xml b/components/camel-huawei/camel-huaweicloud-dms/pom.xml index ed96d8ad7c440..bdea27d23d0be 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-dms/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonFunctionalTest.java index 9526570366b32..a6ac42da4a0a0 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonTest.java index 8a796efa1cdd5..6f3f45427e69f 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceJsonTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequest; import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka1Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka1Test.java index f852314d78d78..91fbaee2e0dc4 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka1Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka1Test.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequest; import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka2Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka2Test.java index beee36a0b6cd6..5f2b5dd8919a7 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka2Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafka2Test.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequest; import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional1Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional1Test.java index 82bb0cf35d018..c482d5c565a46 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional1Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional1Test.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional2Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional2Test.java index 685ccce3c9790..b61fda80b7e8c 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional2Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctional2Test.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoFunctionalTest.java index f8ba30bc09e8e..681bd1f85f560 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoFunctionalTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequestBody; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoTest.java index a2fada540cf5a..0486a32fb6b60 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstancePojoTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequestBody; import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq1Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq1Test.java index d9bc5db94e24e..82c8c36f01f9a 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq1Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq1Test.java @@ -26,7 +26,7 @@ import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequest; import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq2Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq2Test.java index 15a124fe4743f..6f12e3da8aed3 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq2Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmq2Test.java @@ -27,7 +27,7 @@ import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequest; import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional1Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional1Test.java index 032cf225c050a..f35e086a0977e 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional1Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional1Test.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional2Test.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional2Test.java index ef7e966e3a72f..f85436303b12d 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional2Test.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctional2Test.java @@ -25,7 +25,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceFunctionalTest.java index b9c6c651299d3..e10b6d4386c1d 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceTest.java index 6260c68285953..b9847ad3ac469 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/DeleteInstanceTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.dms.models.DeleteInstanceRequest; import org.apache.camel.component.huaweicloud.dms.models.DeleteInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesFunctionalTest.java index 93d43466283da..459a5faa470a4 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesTest.java index df742551d2ee3..63f4497442a72 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/ListInstancesTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.huaweicloud.dms.models.ListInstancesRequest; import org.apache.camel.component.huaweicloud.dms.models.ListInstancesResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceFunctionalTest.java index 5a862b2899809..44f22d578fde3 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceTest.java index 8021a482b0cf4..7450d6e79643c 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/QueryInstanceTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.dms.models.DmsInstance; import org.apache.camel.component.huaweicloud.dms.models.QueryInstanceRequest; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonFunctionalTest.java index b78f0a030ae96..0a32a13c7fe41 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonTest.java index 3987ee7404fe3..8245b508f19b1 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstanceJsonTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.dms.models.UpdateInstanceRequest; import org.apache.camel.component.huaweicloud.dms.models.UpdateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoFunctionalTest.java index a1b08d3871b76..2f61a229e5919 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoFunctionalTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; import org.apache.camel.component.huaweicloud.dms.models.UpdateInstanceRequestBody; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoTest.java index b583b8908b9e5..284def2db5217 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/UpdateInstancePojoTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.huaweicloud.dms.models.UpdateInstanceRequestBody; import org.apache.camel.component.huaweicloud.dms.models.UpdateInstanceResponse; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-frs/pom.xml b/components/camel-huawei/camel-huaweicloud-frs/pom.xml index a6f650bc16c5f..211b10e8e1066 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-frs/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionInvalidParamsTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionInvalidParamsTest.java index 46959bec364f6..665b065c84393 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionInvalidParamsTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionInvalidParamsTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/TestConfiguration.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/TestConfiguration.java index 63fc61604a41e..4410fea438448 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/TestConfiguration.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/TestConfiguration.java @@ -18,7 +18,7 @@ import java.util.*; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageBae64AndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageBae64AndMockClientTest.java index 919f0e901efc5..b9e921ee2faa4 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageBae64AndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageBae64AndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageFileAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageFileAndMockClientTest.java index ee903f452eed0..4a53043550af0 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageFileAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageFileAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageUrlAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageUrlAndMockClientTest.java index 8c623906865a8..db3bf7bfc3347 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageUrlAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceDetectionWithImageUrlAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageBae64AndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageBae64AndMockClientTest.java index 38156b929a9ea..93997c0dd365a 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageBae64AndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageBae64AndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageFileAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageFileAndMockClientTest.java index e1243dada84de..f1e1964583d90 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageFileAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageFileAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageUrlAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageUrlAndMockClientTest.java index eaba3b9d1eee3..db4d8c8aa4359 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageUrlAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/FaceVerificationWithImageUrlAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoBae64AndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoBae64AndMockClientTest.java index 487e65e8cb15b..6f8cd80a7fd7d 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoBae64AndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoBae64AndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoFileAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoFileAndMockClientTest.java index 08ba8dd7fb1ac..112e4d5573a51 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoFileAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoFileAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoUrlAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoUrlAndMockClientTest.java index 5bb1d41441532..49ec78d4ecb37 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoUrlAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/mock/LiveDetectionWithVideoUrlAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageBae64Test.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageBae64Test.java index 4e23c10fac980..c2ffe26774bc1 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageBae64Test.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageBae64Test.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageFileTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageFileTest.java index a0219aa2af8f7..c3f3ee2608405 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageFileTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageFileTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageUrlTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageUrlTest.java index e6a4c99398b89..ac9e6d53f475b 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageUrlTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceDetectionWithImageUrlTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageBae64Test.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageBae64Test.java index 431e72ce18f8a..f20000e90627e 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageBae64Test.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageBae64Test.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageFileTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageFileTest.java index f3b56e12176a8..277cc5dcf0536 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageFileTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageFileTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageUrlTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageUrlTest.java index f5f74c0b85f17..6aa37e2ca9e6f 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageUrlTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/FaceVerificationWithImageUrlTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoBae64Test.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoBae64Test.java index f6cafc2d5def0..50b62f8bf30b5 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoBae64Test.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoBae64Test.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoFileTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoFileTest.java index cfb17c45e7332..06b2f518b81a0 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoFileTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoFileTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoUrlTest.java b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoUrlTest.java index 64171e928aa03..9e2a0853a05e1 100644 --- a/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoUrlTest.java +++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/java/org/apache/camel/component/huaweicloud/frs/real/LiveDetectionWithVideoUrlTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.frs.TestConfiguration; import org.apache.camel.component.huaweicloud.frs.constants.FaceRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml b/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml index 8e4f8f3db679c..f4c4d4e0c3e28 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedFunctionalTest.java index 06a780bd2e8cf..83a4ba7bf672e 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedTest.java index 724fbe364b18e..9e24455b8a3a4 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionCombinedTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointFunctionalTest.java index f4271136df95c..e7ddc908bc848 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointTest.java index 8bbc0aa0b9f3f..e1d2f9a67026e 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionEndpointTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeFunctionalTest.java index 3f3a057bd14aa..822fede91b516 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeTest.java index dcefd2c14626b..fc6800a64d88f 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionExchangeTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionFunctionalTest.java index 7d3500271a191..58e820b3d44c8 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyFunctionalTest.java index b8e798700c4cd..ea3eff11a1f7b 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyFunctionalTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyTest.java index 2bf7cbe6648a6..de529a60774a4 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionServiceKeyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionTest.java index 350ac70d04575..14674816ca7d7 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/InvokeFunctionTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/TestConfiguration.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/TestConfiguration.java index 2e6ff6acfbbcc..21a01b7ce0368 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/TestConfiguration.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/TestConfiguration.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/pom.xml b/components/camel-huawei/camel-huaweicloud-iam/pom.xml index c0ea61ed1eb61..44b116bb3388b 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-iam/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersFunctionalTest.java index 5d60ab299aee0..df58dd422c4dd 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersTest.java index 1af284312fde7..3c0e1ace84ff0 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetGroupUsersTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserFunctionalTest.java index e73e1fac08bb9..d811b473ffce9 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserTest.java index 28367c2c5b5a5..f04bc14134592 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/GetUserTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsFunctionalTest.java index 8f1e95ce3457f..f34d4df0d485d 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsTest.java index bfcdf39660e8f..807d9355b65e8 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListGroupsTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersFunctionalTest.java index e8438be299e4c..1cf3a12f89d18 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersTest.java index 0d7314f7cb4ff..56e26eb7bbdbc 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/ListUsersTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupFunctionalTest.java index b0ae0a5a39f25..8272205c8e8b7 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonFunctionalTest.java index 474fb5eb5c438..a5d8ef4300dfe 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonTest.java index d204e4d3d5d8a..4342e783db21f 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupJsonTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupTest.java index 4cc5d8256e8ed..1735a21b8da43 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateGroupTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserFunctionalTest.java index c6f538f697a7f..3c834f996ee95 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserFunctionalTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonFunctionalTest.java index 51880724f96d0..446368bb979ea 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonTest.java index ed18547f61731..1fa3085eacaa4 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserJsonTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserTest.java index 83450eac650f5..9ad52202017c9 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/UpdateUserTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/pom.xml b/components/camel-huawei/camel-huaweicloud-imagerecognition/pom.xml index c117323799c91..e84b647b1bfe8 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java index c382846ccbe20..aaf348a426049 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImagUrlTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java index 60801615b6db4..b5d6d98d552dc 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentAndMockClientTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java index a00bcbf208083..de879a6140222 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageContentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java index 7ff27a81b99fa..d51a01dcd61fd 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/CelebrityRecognitionWithImageUrlAndMockClientTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java index f4b198d17d678..144632f309680 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java index 6789d52841d04..1b607c793f569 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageContentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java index f7da2b683b677..25b74ce25517c 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlAndMockClientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java index 3ed82d7f567b7..06012ad895415 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TagRecognitionWithImageUrlTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.image.constants.ImageRecognitionProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TestConfiguration.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TestConfiguration.java index 57f1a118c8362..48b82c36836dc 100644 --- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TestConfiguration.java +++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/test/java/org/apache/camel/component/huaweicloud/image/TestConfiguration.java @@ -19,7 +19,7 @@ import java.util.*; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-obs/pom.xml b/components/camel-huawei/camel-huaweicloud-obs/pom.xml index 18d17edc42c2b..4354a2f4adad9 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-obs/pom.xml @@ -73,7 +73,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataFunctionalTest.java index 9fa360b1d9b7a..cb12609a50055 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataTest.java index 5db2a45358e63..364748757c7bc 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/BucketMetadataTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketFunctionalTest.java index 49f154acb4989..67b27d4c3f039 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketFunctionalTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketTest.java index 97e9fa9b21950..88acc7730bc20 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CheckBucketTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketFunctionalTest.java index 0b7ba35c2fa9a..9a58e6b02a163 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonFunctionalTest.java index 3cc20185f83e7..80d058b800136 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonTest.java index c00e72e40eeda..42fdeb0e2d62d 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketJsonTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoFunctionalTest.java index 8fa3812ba238e..0835ba65aa6e4 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoTest.java index 445b4cad55385..82b4c8eb685ce 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketPojoTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketTest.java index 0a96cc8d30313..7a8fe247a7985 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/CreateBucketTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketFunctionalTest.java index 4aa1504fbb1fd..ae9e1c3e72ad8 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketTest.java index 0bb24ae614e4c..49f8b1ead3e5a 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DeleteBucketTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadDeleteFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadDeleteFunctionalTest.java index 5fb8e02805814..b9f4e812ecf86 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadDeleteFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadDeleteFunctionalTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSHeaders; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadFunctionalTest.java index a6875b383a11d..690c1a0ca0c18 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadFunctionalTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSHeaders; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveExistsFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveExistsFunctionalTest.java index 23b3f5748a8b5..5b006aaa84748 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveExistsFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveExistsFunctionalTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSHeaders; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveFunctionalTest.java index 572a68408a339..c7c8e373eb9f4 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadMoveFunctionalTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSHeaders; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadSingleFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadSingleFunctionalTest.java index 7cb5ca8d9d27b..eeeb6bb147edb 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadSingleFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/DownloadSingleFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSHeaders; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectFunctionalTest.java index 331748543e3ad..e39305df71940 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectFunctionalTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectTest.java index 97f50489a9c45..eaca981f8a9b6 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/GetObjectTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.huaweicloud.obs.constants.OBSHeaders; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsFunctionalTest.java index e1facdda26338..1cf2bf5cda081 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsTest.java index fd4355e027463..b3bdfab456c08 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListBucketsTest.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsFunctionalTest.java index 6f4dc1405ea0c..6551b1332af67 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonFunctionalTest.java index f7e6dcaf41a59..574cf8f6acc7b 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonFunctionalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonTest.java index 975c1543627ea..361de2be1e3dd 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsJsonTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsMaxTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsMaxTest.java index dcbf0f84c5d00..3c846490904af 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsMaxTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsMaxTest.java @@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoFunctionalTest.java index 310dafbf1aa1f..b89bbcdbef244 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoTest.java index a1e9a8bab0f25..406e28e37c0cf 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsPojoTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsTest.java index 320ef75b95c3e..34f14beae5181 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/ListObjectsTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectFileFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectFileFunctionalTest.java index cdb8e89624975..47f1be2c61194 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectFileFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectFileFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringFunctionalTest.java index 47331b2657763..23700b8c0c9b8 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringFunctionalTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringTest.java index 9d3b4db6422ef..fad272c8e4ef6 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectStringTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectTest.java index beb3feabeeb35..c59d4d95244e6 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/PutObjectTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.obs.constants.OBSProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-smn/pom.xml b/components/camel-huawei/camel-huaweicloud-smn/pom.xml index b0d4b332c9dd5..e527ab8bd5565 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-smn/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageFunctionalTest.java index 7c06d820bc922..686b4147f12ce 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageFunctionalTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java index 9fa5be88eb362..b14a061301207 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointFunctionalTest.java index 4e6655f5fbeb9..804617ae88311 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointFunctionalTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointTest.java index 30683dfb2ac39..192c986438ef5 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageWithCustomEndpointTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageFunctionalTest.java index 5b85dcfcdb818..02dcb8b8ff7cd 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageTest.java index 84818dea48004..33908d5c54c05 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointFunctionalTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointFunctionalTest.java index 1a42018b7e4cd..71572a2756c43 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointFunctionalTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointFunctionalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointTest.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointTest.java index 362b2bfe6ca1c..aaaf10295bb02 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointTest.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTextMessageWithCustomEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/TestConfiguration.java b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/TestConfiguration.java index 49484fb6dec2f..5cf9b04faa7bf 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/TestConfiguration.java +++ b/components/camel-huawei/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/TestConfiguration.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-ibm/camel-ibm-cos/pom.xml b/components/camel-ibm/camel-ibm-cos/pom.xml index 6e3549cf13938..580957c85dc80 100644 --- a/components/camel-ibm/camel-ibm-cos/pom.xml +++ b/components/camel-ibm/camel-ibm-cos/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java index 7ecc546eaca99..9f405e32ff333 100644 --- a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java +++ b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.ibm.cos; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java index aa20b6e9a403c..de9d3f1b9191d 100644 --- a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java +++ b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java @@ -25,7 +25,7 @@ import com.ibm.cloud.objectstorage.oauth.BasicIBMOAuthCredentials; import com.ibm.cloud.objectstorage.services.s3.AmazonS3; import com.ibm.cloud.objectstorage.services.s3.AmazonS3ClientBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-ibm/camel-ibm-secrets-manager/pom.xml b/components/camel-ibm/camel-ibm-secrets-manager/pom.xml index 6664460291e44..3ba46d52276a6 100644 --- a/components/camel-ibm/camel-ibm-secrets-manager/pom.xml +++ b/components/camel-ibm/camel-ibm-secrets-manager/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java index a8851c3290812..eb30d5005a713 100644 --- a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java +++ b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java index 140f639fc0f7d..c24425062c4eb 100644 --- a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java +++ b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java index ba6f0d5936960..dd83671cc84e9 100644 --- a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java +++ b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java index 26f6d60a7aeb8..d43d6a9155a23 100644 --- a/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java +++ b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-ibm/camel-ibm-watson-discovery/pom.xml b/components/camel-ibm/camel-ibm-watson-discovery/pom.xml index b37e67abac8a2..dba95f2d2c969 100644 --- a/components/camel-ibm/camel-ibm-watson-discovery/pom.xml +++ b/components/camel-ibm/camel-ibm-watson-discovery/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryComponentTest.java b/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryComponentTest.java index b9de9f11f38da..e7415d84c8f1e 100644 --- a/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryComponentTest.java +++ b/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.discovery; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/integration/WatsonDiscoveryTestSupport.java b/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/integration/WatsonDiscoveryTestSupport.java index 907720d1f3d44..f6200b161f479 100644 --- a/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/integration/WatsonDiscoveryTestSupport.java +++ b/components/camel-ibm/camel-ibm-watson-discovery/src/test/java/org/apache/camel/component/ibm/watson/discovery/integration/WatsonDiscoveryTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.discovery.integration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; /** * Base class for Watson Discovery integration tests. diff --git a/components/camel-ibm/camel-ibm-watson-language/pom.xml b/components/camel-ibm/camel-ibm-watson-language/pom.xml index a1c7639d4c2ab..065e7ef61ddf8 100644 --- a/components/camel-ibm/camel-ibm-watson-language/pom.xml +++ b/components/camel-ibm/camel-ibm-watson-language/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java b/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java index 52739f7ea8e50..deb815537b509 100644 --- a/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java +++ b/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.language; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java b/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java index 077db90fc6ac1..6f81d3a63be98 100644 --- a/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java +++ b/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.language.integration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; /** * Base class for Watson Natural Language Understanding integration tests. diff --git a/components/camel-ibm/camel-ibm-watson-speech-to-text/pom.xml b/components/camel-ibm/camel-ibm-watson-speech-to-text/pom.xml index 1b16bd3d485c1..4ed7461eddd0a 100644 --- a/components/camel-ibm/camel-ibm-watson-speech-to-text/pom.xml +++ b/components/camel-ibm/camel-ibm-watson-speech-to-text/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextComponentTest.java b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextComponentTest.java index 01927b9f871fc..75a0711d2522c 100644 --- a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextComponentTest.java +++ b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.stt; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextTestSupport.java b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextTestSupport.java index dd9b90db99fb4..7f4b9acc857f2 100644 --- a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextTestSupport.java +++ b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.stt.integration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; /** * Base class for Watson Speech to Text integration tests. diff --git a/components/camel-ibm/camel-ibm-watson-text-to-speech/pom.xml b/components/camel-ibm/camel-ibm-watson-text-to-speech/pom.xml index 7bcf4f873adac..a6c869bbe78f8 100644 --- a/components/camel-ibm/camel-ibm-watson-text-to-speech/pom.xml +++ b/components/camel-ibm/camel-ibm-watson-text-to-speech/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/WatsonTextToSpeechComponentTest.java b/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/WatsonTextToSpeechComponentTest.java index a3989471ac6a7..8f8e738c55a2a 100644 --- a/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/WatsonTextToSpeechComponentTest.java +++ b/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/WatsonTextToSpeechComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.tts; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/integration/WatsonTextToSpeechTestSupport.java b/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/integration/WatsonTextToSpeechTestSupport.java index 49864d88b0c81..e286ef0ecfc2b 100644 --- a/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/integration/WatsonTextToSpeechTestSupport.java +++ b/components/camel-ibm/camel-ibm-watson-text-to-speech/src/test/java/org/apache/camel/component/ibm/watson/tts/integration/WatsonTextToSpeechTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watson.tts.integration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; /** * Base class for Watson Text to Speech integration tests. diff --git a/components/camel-ibm/camel-ibm-watsonx-ai/pom.xml b/components/camel-ibm/camel-ibm-watsonx-ai/pom.xml index 7373a4743e981..af819eb7655ae 100644 --- a/components/camel-ibm/camel-ibm-watsonx-ai/pom.xml +++ b/components/camel-ibm/camel-ibm-watsonx-ai/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiTestSupport.java b/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiTestSupport.java index eb35b865ada5e..50073830c36b9 100644 --- a/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiTestSupport.java +++ b/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ibm.watsonx.ai.integration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; /** * Base class for watsonx.ai integration tests. diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml index b0ddc41ed2d37..62441073b4200 100644 --- a/components/camel-ical/pom.xml +++ b/components/camel-ical/pom.xml @@ -47,7 +47,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java index 686013109d3b7..29c59de6c66c9 100644 --- a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java +++ b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java @@ -40,7 +40,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-iec60870/pom.xml b/components/camel-iec60870/pom.xml index c309d4e494646..f07bc7cde9c94 100644 --- a/components/camel-iec60870/pom.xml +++ b/components/camel-iec60870/pom.xml @@ -96,7 +96,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java index 2f075da434236..af4ba0db6227c 100644 --- a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java +++ b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mock.AssertionClause; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value; import org.eclipse.neoscada.protocol.iec60870.client.AutoConnectClient.State; import org.eclipse.neoscada.protocol.iec60870.server.data.model.WriteModel.Request; diff --git a/components/camel-iggy/pom.xml b/components/camel-iggy/pom.xml index 106a5e48d8b6f..029b66d7bc022 100644 --- a/components/camel-iggy/pom.xml +++ b/components/camel-iggy/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -100,4 +100,4 @@ - \ No newline at end of file + diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml index ec67d119286c8..0fc98dd1e7a9c 100644 --- a/components/camel-ignite/pom.xml +++ b/components/camel-ignite/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java index 4d844ec12bbf0..54cfa94236640 100644 --- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java +++ b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java @@ -22,7 +22,7 @@ import org.apache.camel.test.infra.common.TestEntityNameGenerator; import org.apache.camel.test.infra.ignite.services.IgniteService; import org.apache.camel.test.infra.ignite.services.IgniteServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.IgniteConfiguration; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-infinispan/camel-infinispan-common/pom.xml b/components/camel-infinispan/camel-infinispan-common/pom.xml index 3603d983a7b4c..f0912d575e5b3 100644 --- a/components/camel-infinispan/camel-infinispan-common/pom.xml +++ b/components/camel-infinispan/camel-infinispan-common/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java b/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java index bff566832713a..cbb10b3b5cfdb 100644 --- a/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java +++ b/components/camel-infinispan/camel-infinispan-common/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java @@ -18,7 +18,7 @@ import java.util.concurrent.ThreadLocalRandom; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.infinispan.commons.api.BasicCache; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.TestMethodOrder; diff --git a/components/camel-infinispan/camel-infinispan-embedded/pom.xml b/components/camel-infinispan/camel-infinispan-embedded/pom.xml index 8c6e75bc4675e..3b5df7c6831f1 100644 --- a/components/camel-infinispan/camel-infinispan-embedded/pom.xml +++ b/components/camel-infinispan/camel-infinispan-embedded/pom.xml @@ -73,7 +73,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -119,7 +119,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java index 3557c9de9b58f..5c4d7938c7d27 100644 --- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java +++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java @@ -21,7 +21,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.spi.ComponentCustomizer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.infinispan.Cache; import org.infinispan.commons.api.BasicCacheContainer; import org.infinispan.commons.time.ControlledTimeService; diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositoryTestSupport.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositoryTestSupport.java index 3aaf1136ab82e..12bfdaeef71d4 100644 --- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositoryTestSupport.java +++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/spring/SpringInfinispanEmbeddedIdempotentRepositoryTestSupport.java @@ -19,7 +19,7 @@ import java.util.UUID; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; public abstract class SpringInfinispanEmbeddedIdempotentRepositoryTestSupport extends CamelSpringTestSupport { diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml index 3e98cbd7f2523..49ecf22dc9baf 100644 --- a/components/camel-infinispan/camel-infinispan/pom.xml +++ b/components/camel-infinispan/camel-infinispan/pom.xml @@ -70,7 +70,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -132,7 +132,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryTestSupport.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryTestSupport.java index 4e6acccada600..7e3847e56c351 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryTestSupport.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryTestSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.infinispan.services.InfinispanService; import org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; diff --git a/components/camel-influxdb/pom.xml b/components/camel-influxdb/pom.xml index 0600a5d0c3d00..f7ecb5377f634 100644 --- a/components/camel-influxdb/pom.xml +++ b/components/camel-influxdb/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java index 6943f95336981..1e1cb075d841a 100644 --- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java +++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.influxdb; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.influxdb.InfluxDB; import org.influxdb.impl.InfluxDBImpl; diff --git a/components/camel-influxdb2/pom.xml b/components/camel-influxdb2/pom.xml index 14cc2b93b8c6f..0c09f99027108 100644 --- a/components/camel-influxdb2/pom.xml +++ b/components/camel-influxdb2/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/AbstractInfluxDbTest.java b/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/AbstractInfluxDbTest.java index ff30d41e69b37..b322c5fcaa57f 100644 --- a/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/AbstractInfluxDbTest.java +++ b/components/camel-influxdb2/src/test/java/org/apache/camel/component/influxdb2/AbstractInfluxDbTest.java @@ -18,7 +18,7 @@ import com.influxdb.client.InfluxDBClient; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml index a886343eadbeb..21c2a770c8258 100644 --- a/components/camel-irc/pom.xml +++ b/components/camel-irc/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java index c934ae405f9a3..4c69582c534f1 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java @@ -18,7 +18,7 @@ import java.util.List; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationITSupport.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationITSupport.java index 16e1edac4abd2..992a458454775 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationITSupport.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationITSupport.java @@ -22,8 +22,8 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml index b64b78ef4bc72..ac43bdca66c71 100644 --- a/components/camel-ironmq/pom.xml +++ b/components/camel-ironmq/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java index 1869ea33f39d2..c7481cae0eea0 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java @@ -26,7 +26,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java index 8e79697e21b3c..3b1a5683104a6 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class IronMQBatchConsumerTest extends CamelTestSupport { diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java index da547d8ce773d..d2f5c9bc3dada 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java @@ -25,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class IronMQBatchDeleteConsumerTest extends CamelTestSupport { diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java index 53e3f59e59cb1..67a1f4788817e 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java @@ -26,10 +26,10 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java index f632d385ff4b8..f16f204aaf014 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.ironmq; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java index d7170b1c8b854..745d9da2671e2 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java index 0f0c6d92d59bf..d9b0466bf4f12 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java index 8eda7db26530c..277f6ce8acbb6 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java @@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java index 69cd9d6f6730e..edd5e383f0cb5 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.ironmq.IronMQConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyManualTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyManualTest.java index fa6ddffd71217..270ff9091bceb 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyManualTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyManualTest.java @@ -19,13 +19,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.ironmq.IronMQConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @Disabled("Integration test that requires ironmq account.") public class FileCopyManualTest extends CamelTestSupport { diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentManualTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentManualTest.java index 4ff47d0639b4e..e142ca5affdfe 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentManualTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentManualTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java index 7c3df11eedd68..ebf25e91a7504 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.ironmq.IronMQConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentManualTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentManualTest.java index 7b18f0a562cf5..06a1e619c9419 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentManualTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentManualTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java index d13cda1974a56..342512b95402e 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.ironmq.IronMQConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java index db2b6121a8288..5635ca3247210 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.ironmq.IronMQConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-iso8583/pom.xml b/components/camel-iso8583/pom.xml index d34a52efc0754..fb97785410e96 100644 --- a/components/camel-iso8583/pom.xml +++ b/components/camel-iso8583/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatGroovyTest.java b/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatGroovyTest.java index 0d2275821cb2e..3f09b5f8e94fc 100644 --- a/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatGroovyTest.java +++ b/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatGroovyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Iso8583DataFormatGroovyTest extends CamelTestSupport { diff --git a/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatSimpleTest.java b/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatSimpleTest.java index 70f42bebfb594..04779583584c1 100644 --- a/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatSimpleTest.java +++ b/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatSimpleTest.java @@ -22,7 +22,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Iso8583DataFormatSimpleTest extends CamelTestSupport { diff --git a/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatTest.java b/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatTest.java index d113257a0a4fe..7684b778a50a9 100644 --- a/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatTest.java +++ b/components/camel-iso8583/src/test/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatTest.java @@ -25,7 +25,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-jackson-avro/pom.xml b/components/camel-jackson-avro/pom.xml index 6133aa97209fb..4cd8f7f7efd18 100644 --- a/components/camel-jackson-avro/pom.xml +++ b/components/camel-jackson-avro/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java index 5fd9104ab5ba6..44075824b5542 100644 --- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java +++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.jackson.SchemaResolver; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java index dccf1fae93d84..22edfd5d2a19e 100644 --- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java +++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.jackson.SchemaResolver; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java index 84863f7898cbc..384a4fa77b6b5 100644 --- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java +++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java index fe33c09331d26..5bfaff7aa36dc 100644 --- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java +++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.jackson.SchemaResolver; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson-protobuf/pom.xml b/components/camel-jackson-protobuf/pom.xml index 355cce37809e2..e456ab45fdd14 100644 --- a/components/camel-jackson-protobuf/pom.xml +++ b/components/camel-jackson-protobuf/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java index 94fd69b5bd5e5..2d14ffb73826b 100644 --- a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java +++ b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.ProtobufLibrary; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java index 0116f3b26a0c7..e58da5b8bf663 100644 --- a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java +++ b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.ProtobufLibrary; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java index 872819e8523cc..d03d5367e574e 100644 --- a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java +++ b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.ProtobufLibrary; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml index 40431f698efdf..9b4ce92c20e74 100644 --- a/components/camel-jackson/pom.xml +++ b/components/camel-jackson/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java index da7ef85e42d20..7eed732cf70e1 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java @@ -23,10 +23,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class JacksonConcurrentTest extends CamelTestSupport { diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonFeaturesTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonFeaturesTest.java index 21322c4c950f6..7038acf9b52df 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonFeaturesTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonFeaturesTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonFeaturesTest extends CamelTestSupport { diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeDefaultTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeDefaultTest.java index a4b37ec6e8626..01c27ed2adec7 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeDefaultTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeDefaultTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonIncludeDefaultTest extends CamelTestSupport { diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeNotNulllTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeNotNulllTest.java index ca0f04d137be4..268e90a895f3d 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeNotNulllTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonIncludeNotNulllTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonIncludeNotNulllTest extends CamelTestSupport { diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java index 00eec75b8afdf..bb0aba676c9cb 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalAllowJMSTypeTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalAllowJMSTypeTest.java index 1deec4f0f0908..cefc31eb5737c 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalAllowJMSTypeTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalAllowJMSTypeTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java index 0e08b159e5d0c..d02677bcaa81f 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java index dcde2c21b6346..31a5efdf7e47e 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalDateTimezoneTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalMultibyteCharactersTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalMultibyteCharactersTest.java index 0a17cbf12fba7..7f5cd23d80101 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalMultibyteCharactersTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalMultibyteCharactersTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java index 8317d0d1291db..091b3e7c74f58 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteConfigurationBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java index e89ca08df1961..31759d7b2c9a4 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalArrayTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalArrayTest.java index 0cf99e00b192f..930b92da01918 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalArrayTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalArrayTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalListTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalListTest.java index a3cc53b001cce..3631d3cac836f 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalListTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalListTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalPojoArrayTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalPojoArrayTest.java index d18843a63bbc6..2a7bd28a6625c 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalPojoArrayTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalPojoArrayTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java index 7dea52fb99afc..48822b136a3ce 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonMarshalUnmarshalTypeHeaderNotAllowedTest extends CamelTestSupport { diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java index d3485ccccb009..7503757db7911 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java index e8b13b852f9ae..bc5a056b536f8 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonModuleTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonModuleTest.java index 4679f4284b317..cbb6ea23c93b9 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonModuleTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonModuleTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonModuleTest extends CamelTestSupport { diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNotUseDefaultObjectMapperTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNotUseDefaultObjectMapperTest.java index 56f8949744863..26145fb7c3618 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNotUseDefaultObjectMapperTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNotUseDefaultObjectMapperTest.java @@ -23,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectListSplitTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectListSplitTest.java index 961f031b4861c..d5e6ddc4a38d6 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectListSplitTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectListSplitTest.java @@ -18,10 +18,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class JacksonObjectListSplitTest extends CamelTestSupport { @Test diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectMapperRegistryTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectMapperRegistryTest.java index fe5855eb1fea9..915c020ad82ef 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectMapperRegistryTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectMapperRegistryTest.java @@ -23,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonAllowNullBodyTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonAllowNullBodyTest.java index 106bbbb31662e..f1f440db5f1aa 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonAllowNullBodyTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonAllowNullBodyTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jackson; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.java index 1172c9d4641d9..ec85f9d842402 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.jackson; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatNamingStrategyTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatNamingStrategyTest.java index 665140d52b8fc..36b0ddf3ba881 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatNamingStrategyTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatNamingStrategyTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jackson; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java index ddd48ca6e0bc8..455755526c552 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.java index b0eec9d882c85..676356ca44bc7 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.java @@ -19,7 +19,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java index 4e7d32b8a48a8..b5ed56c1f952b 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.reifier.dataformat.DataFormatReifier; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsBufferTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsBufferTest.java index 883137e06b45b..bd6d6a0c9462d 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsBufferTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsBufferTest.java @@ -24,7 +24,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jackson.JacksonConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsPojoTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsPojoTest.java index 085a46113ce8c..a403cbde9c028 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsPojoTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsPojoTest.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jackson.JacksonConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsSimpleTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsSimpleTest.java index b4b797c13305d..b07d6fa495d58 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsSimpleTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsSimpleTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.component.jackson.JacksonConstants; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsTest.java index b5faa61d4ece7..bbb6731c74e44 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jackson.JacksonConstants; import org.apache.camel.component.jackson.TestPojo; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonJSonNodeConverterTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonJSonNodeConverterTest.java index 8290a5bd91710..f81c88312c56f 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonJSonNodeConverterTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonJSonNodeConverterTest.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.node.TextNode; import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml index 56e6c8ebfc64e..154e160123d64 100644 --- a/components/camel-jacksonxml/pom.xml +++ b/components/camel-jacksonxml/pom.xml @@ -57,7 +57,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java index 24d996ad92c99..4303672c8747d 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class JacksonConcurrentTest extends CamelTestSupport { diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java index 79c9d8b5ed53d..84e6ab2bf88df 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java index f7fb931d38cdf..8a5698ecaf281 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonEmptyElementsAsNullTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonEmptyElementsAsNullTest.java index 364ab8c39be92..7a3ef91ebb1c8 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonEmptyElementsAsNullTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonEmptyElementsAsNullTest.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java index 0b5c86bb17791..ebccb65be0fec 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonIncludeDefaultTest extends CamelTestSupport { diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java index 6091b1a66b865..9bc31dcf0b881 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonIncludeNotNulllTest extends CamelTestSupport { diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java index 876ba8f3af6e6..765a5eb8bc5c4 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalAllowJMSTypeTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalAllowJMSTypeTest.java index d24ee5c5f01cc..ba3d7fa75b069 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalAllowJMSTypeTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalAllowJMSTypeTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java index 07336c37daa58..d0f60af6ecbef 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java index 1529a7999889c..2177797fa18fb 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalDateTimezoneTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java index abf8e069a065d..305f3efdd3e20 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java index 13b9d81b84064..04e80acc7ab78 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java index a2aecc75e7054..407f23f7c340e 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonMarshalUnmarshalTypeHeaderNotAllowedTest extends CamelTestSupport { diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java index 548a0094618eb..21e3293d4bc32 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java index e7be42d841f5f..5b601f041d2a6 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java index 371f5bbe8f7a6..9de05313efad4 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JacksonModuleTest extends CamelTestSupport { diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java index de0fef95b80c9..29b742b785f4e 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java @@ -18,10 +18,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class JacksonObjectListSplitTest extends CamelTestSupport { @Test diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java index 53fcf87dbef6b..b1f4b9dea3b2d 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.jacksonxml; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java index aaddfe873c4f9..e8df5035dd737 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java @@ -19,7 +19,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonXmlDataFormatTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonXmlDataFormatTest.java index 0a3810bf439d4..3f15e1526a62b 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonXmlDataFormatTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonXmlDataFormatTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jandex/pom.xml b/components/camel-jandex/pom.xml index b63341e98d5d9..f6cd0548ffad7 100644 --- a/components/camel-jandex/pom.xml +++ b/components/camel-jandex/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml index 8cd4c7ae070ff..310816267a5e6 100644 --- a/components/camel-jasypt/pom.xml +++ b/components/camel-jasypt/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java index 88093eb740a6b..87dd5bae5c4ea 100644 --- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java +++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/JasyptPropertiesTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.properties.PropertiesComponent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JasyptPropertiesTest extends CamelTestSupport { diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java index e2f019df3edab..66138b07768c7 100644 --- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java +++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesAutowireTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jasypt; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java index 0d4b76b2f5092..7f95e155d6483 100644 --- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java +++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptBridgePropertiesTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jasypt; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java index cda149b3b3a27..e59b7a850af85 100644 --- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java +++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptProperties2Test.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jasypt; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java index 9bd5094cf8a69..77bcdf4ba9a4f 100644 --- a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java +++ b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/SpringJasyptPropertiesTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jasypt; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-javascript/pom.xml b/components/camel-javascript/pom.xml index 8f9556a99c786..49132d897d49d 100644 --- a/components/camel-javascript/pom.xml +++ b/components/camel-javascript/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptChoiceTest.java b/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptChoiceTest.java index 8346fc154da64..0f0dcde60f88c 100644 --- a/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptChoiceTest.java +++ b/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptChoiceTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptTest.java b/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptTest.java index 07b33f5ab131c..ef380a6649c15 100644 --- a/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptTest.java +++ b/components/camel-javascript/src/test/java/org/apache/camel/language/js/JavaScriptTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.language.js; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml index 71a5a09aa3c35..8c9915023b753 100644 --- a/components/camel-jaxb/pom.xml +++ b/components/camel-jaxb/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -81,7 +81,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java index 432355c0c2e62..53b89fd6478eb 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.address.Address; import org.apache.camel.converter.jaxb.person.Person; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JAXBElementFallbackTypeConverterTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JAXBElementFallbackTypeConverterTest.java index 6da9ec2df12c9..ce1b1e3772a30 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JAXBElementFallbackTypeConverterTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JAXBElementFallbackTypeConverterTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.converter.jaxb.person.Person; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java index 3b1a65758ce6d..8c7aa44e6e5e5 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.example.Address; import org.apache.camel.example.Order; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java index 0c224bf7a0470..b2621ca746e9e 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.example.Address; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java index 3f0f15b44dbcb..6c9e67ec55d42 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.example.Address; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java index 3a5add466bb1c..3d1e27902ae98 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java @@ -32,14 +32,14 @@ import org.apache.camel.converter.jaxb.message.Message; import org.apache.camel.converter.jaxb.message.ObjectFactory; import org.apache.camel.converter.jaxb.person.Person; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java index 4db0af4afc95e..fc0794e38d78d 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java @@ -24,12 +24,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.address.Address; import org.apache.camel.converter.jaxb.person.Person; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java index 4eaf749cb14a0..0df678c8f358f 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java @@ -29,11 +29,11 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.message.Message; import org.apache.camel.converter.jaxb.message.ObjectFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java index f05f4984318f6..d7ada1c36a399 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java index 7e741ab1d05bc..44815ce00e0f8 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java @@ -22,7 +22,7 @@ import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class DataFormatDataSetTest extends CamelTestSupport { diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java index 91da57a532bbd..11936f163fdc1 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.foo.bar.PersonType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java index d34a40733fdba..4e0dab5518a00 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java @@ -29,8 +29,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java index cb09330015417..c4f91ddad259f 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java @@ -24,8 +24,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java index 7ae23a475d942..c0732a40f384f 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java @@ -23,7 +23,7 @@ import org.apache.camel.StreamCache; import org.apache.camel.TypeConversionException; import org.apache.camel.TypeConverter; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java index 7f65a70f266c4..5bb71fd47c236 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java @@ -24,10 +24,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class JaxbConcurrentDataFormatTest extends CamelTestSupport { 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 a47fe125d80c1..39b4e2145e29d 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 @@ -23,7 +23,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JaxbErrorLogTest extends CamelTestSupport { diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java index 4ec9ccd2de542..df89d1841d2ea 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class RouteWithErrorHandlerTest extends CamelTestSupport { diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java index 57dbe0f07b204..2687603e4096a 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.language.XPathExpression; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java index 616f558f6e0fa..878c0d394ebb2 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java @@ -17,7 +17,7 @@ package org.apache.camel.example; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java index bc3774cc00f56..060e366c6f973 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringLoadRouteFromXmlTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringLoadRouteFromXmlTest.java index 47765d2abbc5a..7a62ab243ddde 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringLoadRouteFromXmlTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringLoadRouteFromXmlTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.RoutesDefinition; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java index e90ef228c2dc8..b30b4d542960d 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class UnmarshalTest extends CamelTestSupport { diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java index ccb2c49c2dde2..146a07c456caf 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java @@ -26,7 +26,7 @@ import org.apache.camel.example.Foo; import org.apache.camel.foo.bar.PersonType; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java index 76d996d0c61fe..7d598f5612c27 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.foo.bar.PersonType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java index aef26614294c9..0d80c4d95d7fe 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.foo.bar.PersonType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java index 5de90c266d5d4..b65e782136834 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.foo.bar.PersonType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java index 5b39127ec3ea0..1c96c696e1a43 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.converter.jaxb.FallbackTypeConverter; import org.apache.camel.converter.jaxb.message.Message; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java index 8aba8c9b70231..070b863fc30a8 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.FallbackTypeConverter; import org.apache.camel.converter.jaxb.message.Message; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class FallbackTypeConverterObjectFactoryEnabledTest extends CamelTestSupport { diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java index 94e9f8cc54f6b..41db56c18bd46 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.example.Bar; import org.apache.camel.example.Foo; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterTest.java index 2ba7563cda050..7800a5c498b26 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.converter.jaxb.FallbackTypeConverter; import org.apache.camel.example.Bar; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java index 76f6ed69e5b2c..faa16295a43e4 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java index a4499084d9be9..736a321e7ae54 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java @@ -25,10 +25,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java index 3c448d4040498..2890854545d2e 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java @@ -25,7 +25,7 @@ import org.apache.camel.example.Address; import org.apache.camel.example.Order; import org.apache.camel.model.dataformat.JaxbDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java index 4a617f4f19efb..fb388c522ccfa 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java @@ -34,7 +34,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java index a64ca7f63b733..98d02e51aab94 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml index ef65e753bc00e..f21b2a87c6e3d 100644 --- a/components/camel-jcache/pom.xml +++ b/components/camel-jcache/pom.xml @@ -50,12 +50,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java index e3c63e4cf8559..5b657ce34eeae 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java @@ -23,7 +23,7 @@ import javax.cache.Cache; import org.apache.camel.component.jcache.support.HazelcastTest; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java index 22c0009d0657d..567deede53f18 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java @@ -23,7 +23,7 @@ import javax.cache.Caching; import org.apache.camel.component.jcache.support.HazelcastTest; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java index 2b2f9023e60a4..83bfc9e2616ae 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.jcache.support.HazelcastTest; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java index db7e02ef44b28..9d2292427e1da 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.component.jcache.JCacheConfiguration; import org.apache.camel.component.jcache.support.HazelcastTest; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; @HazelcastTest class JCacheAggregationRepositoryTestSupport extends CamelTestSupport { diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java index f1488d35bd62e..b32de43d0036d 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.jcache.JCacheHelper; import org.apache.camel.component.jcache.JCacheManager; import org.apache.camel.component.jcache.support.HazelcastTest; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml index 2bae7287e4b6e..6be973acc7fb6 100644 --- a/components/camel-jcr/pom.xml +++ b/components/camel-jcr/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java index 58a28619b2a6a..29b4807296ec9 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java @@ -25,14 +25,14 @@ import javax.jcr.security.AccessControlPolicyIterator; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.TransientRepository; import org.junit.jupiter.api.BeforeAll; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Base class for tests that use authentication/authorization in the repository. Ensures that the transient repo is set diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java index 7e7ea2ebaa039..6be1cab6a8697 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java @@ -26,11 +26,11 @@ import javax.jcr.Workspace; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.jackrabbit.core.TransientRepository; import org.junit.jupiter.api.BeforeEach; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * JcrRouteDifferentWorkspaceTestSupport diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java index ed9957d7c1a3c..0c1cbedd16b1a 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTestSupport.java @@ -25,10 +25,10 @@ import javax.jcr.SimpleCredentials; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.jackrabbit.core.TransientRepository; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * JcrRouteTestSupport diff --git a/components/camel-jdbc/pom.xml b/components/camel-jdbc/pom.xml index b7ce4c5489fc3..43c268703fdc6 100644 --- a/components/camel-jdbc/pom.xml +++ b/components/camel-jdbc/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java index 4d801bb9078d0..dd8ad687f0868 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcTestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jdbc; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcParameterizedQueryTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcParameterizedQueryTest.java index 55e328e15fdd4..e573f022392a1 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcParameterizedQueryTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcParameterizedQueryTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class JdbcParameterizedQueryTest extends AbstractJdbcTestSupport { diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java index e18855aa38595..edea9c5f240a0 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java index 81d292ddaa942..c75a28214fc7f 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class JdbcProducerOutputTypeSelectListTest extends AbstractJdbcTestSupport { diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java index 9e381156623cb..df99db205c210 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class JdbcProducerOutputTypeSelectOneOutputClassTest extends AbstractJdbcTestSupport { diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java index 997b8a1c039bc..f54ff70f74c7d 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class JdbcProducerOutputTypeSelectOneTest extends AbstractJdbcTestSupport { diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListOutputClassTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListOutputClassTest.java index 0e67faa3e487a..a6a3825535e07 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListOutputClassTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListOutputClassTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; public class JdbcProducerOutputTypeStreamListOutputClassTest extends AbstractJdbcTestSupport { private static final String QUERY = "select * from customer"; diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java index 262b0c25b8f58..04eb7bf5c8120 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; public class JdbcProducerOutputTypeStreamListTest extends AbstractJdbcTestSupport { private static final String QUERY = "select * from customer"; diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java index 480a4c624efdf..f19a30aa97a22 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml index 6e1aad3e1f159..d10db4248ff02 100644 --- a/components/camel-jetty-common/pom.xml +++ b/components/camel-jetty-common/pom.xml @@ -102,7 +102,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml index c8b388e832bbc..439cb18bc5a04 100644 --- a/components/camel-jetty/pom.xml +++ b/components/camel-jetty/pom.xml @@ -96,7 +96,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java index 4f9f9b562e4c5..15aa087932dce 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.http.common.HttpHeaderFilterStrategy; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java index 9569c5777ea90..d83e090fb027c 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; public class ConvertPayloadToInputStreamTest extends BaseJettyTest { diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java index 4e260dba4853a..1b5f2819f201b 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java @@ -37,7 +37,7 @@ import org.eclipse.jetty.util.resource.URLResourceFactory; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java index d60df31c2f636..0005bbf242cfe 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEndpointURLTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEndpointURLTest.java index b6a8f67a901a5..92393df0f0deb 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEndpointURLTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEndpointURLTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.jetty; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java index 48bd9c617004a..3a6b6baccc703 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpOperationsFailedExceptionUriTest.java @@ -23,7 +23,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingConsumerTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingConsumerTest.java index a4d9509191458..83959f27d8780 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingConsumerTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingConsumerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java index 5c540e8661d31..e167c80e7031b 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerOkStatusCodeRangeTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerOkStatusCodeRangeTest.java index a793d6cb7bceb..cd8afe81d1329 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerOkStatusCodeRangeTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerOkStatusCodeRangeTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java index 003e8497bb3f5..8ab6764876e45 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java index 60d4a3822073a..8e0113f165bcd 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectNoLocationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java index 4885c812b5c3a..ec26ad06d1e39 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRedirectTest.java @@ -24,7 +24,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileStopIssueTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileStopIssueTest.java index e082f8460a4f7..263de41342a93 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileStopIssueTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileStopIssueTest.java @@ -24,8 +24,8 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java index 1b56e74beca72..87c50467e6345 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java index 6cc319a8b0cac..37dd50e9f9037 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java @@ -22,12 +22,12 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java index 6ff4bfc3ec0cd..5956692f8a185 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java @@ -37,7 +37,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.jsse.SSLContextParameters; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java index 8393e6f76839e..958552c9e71f3 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.java index 2fb9cb3f8fa28..1ae9411e06fd9 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.java @@ -19,7 +19,7 @@ import java.util.Map; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyFailoverRoundRobinTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyFailoverRoundRobinTest.java index 7e0db40a9667c..b668b8e57f069 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyFailoverRoundRobinTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyFailoverRoundRobinTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpHeadersCompatibilityTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpHeadersCompatibilityTest.java index 844933b2e96fd..00482d38bcfc2 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpHeadersCompatibilityTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpHeadersCompatibilityTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JettyHttpHeadersCompatibilityTest extends CamelTestSupport { diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java index 87388ab6a85a8..d0926a25daacd 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java @@ -23,7 +23,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java index 489b3174e06a4..55b122d978d34 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java @@ -23,7 +23,7 @@ import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java index c015c2e19e6e7..e95f125735e3e 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java @@ -23,7 +23,7 @@ import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java index 8da325de8758f..9f0821a6aadea 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java @@ -21,7 +21,7 @@ import org.apache.camel.http.common.HttpConsumer; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java index 52011421fadd6..a81921ed02b02 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java @@ -21,7 +21,7 @@ import org.apache.camel.http.common.HttpConsumer; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java index a0b99bfa44cb6..4c957b873669a 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java index 2baac48fb9bd7..625f5cefb1cae 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java index 31ed04ec820b8..b2865afa73faf 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java index ad004edc5602c..aa39f8b365c23 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java index cfb3064df3701..1bb49243c8459 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java index fba48b3749d5c..408d9115af601 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MainHttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MainHttpsRouteTest.java index 12b88e0659ca1..166afd1ded657 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MainHttpsRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MainHttpsRouteTest.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.main.Main; import org.apache.camel.support.jsse.ClientAuthentication; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java index 1c5c1cb381665..ed45aa3f75e5f 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java index 0aa46d329d546..deccf1deb9a77 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java index c3d444b16d61e..0c4d8b774b3aa 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java @@ -31,7 +31,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java index afc41dd065806..22abb66970ce1 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java index 2d48ea6b3ff13..274cbe506c8f2 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java @@ -21,12 +21,12 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.context.support.AbstractXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java index 394df6b7892f6..925db78287e1f 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java index aa44a98f9c8d8..0a12643f08cb7 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jetty.BaseJettyTest; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyHttpFileCacheTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyHttpFileCacheTest.java index 571a07936c750..a5cdd5c1fdfd5 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyHttpFileCacheTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyHttpFileCacheTest.java @@ -19,11 +19,11 @@ import java.io.File; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java index 58bf32353dfe0..247acf7d7b977 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java @@ -27,7 +27,7 @@ import org.apache.camel.http.common.HttpConstants; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java index 31eb4bb60b3ca..a7a55fef12757 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java @@ -25,7 +25,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTransferExceptionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTransferExceptionTest.java index 68f46c8d91401..fe370376d90a6 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTransferExceptionTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTransferExceptionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.jetty.BaseJettyTest; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java index e361a0f486f0b..42d2697b763ac 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java @@ -29,7 +29,7 @@ import org.apache.camel.support.jsse.SSLContextServerParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java index 398180b50306f..e19c531923fe5 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java @@ -29,7 +29,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.java index 3e4d92812d7d0..e18f2c1181475 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.java @@ -17,12 +17,12 @@ package org.apache.camel.component.jetty.rest; import org.apache.camel.http.base.HttpOperationFailedException; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyClientResponseValidationResponseCodeTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyClientResponseValidationResponseCodeTest.java index 778f449a6f057..eee5bc1724d06 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyClientResponseValidationResponseCodeTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyClientResponseValidationResponseCodeTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestBindingMode; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java index eee167c1b97ee..beb46a12884bd 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java @@ -24,7 +24,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java index d9efb0a4faea5..0ae45c2ef96f0 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidContentTypeClientRequestValidationTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestBindingMode; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java index 0e55687fa0bf5..83a40fa45230c 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestBindingMode; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientResponseValidationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientResponseValidationTest.java index 0c91f330e266a..195ba3093674b 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientResponseValidationTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientResponseValidationTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestBindingMode; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java index 8144b3fa9209f..4238fd8817183 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java index 43aadf5bc64db..4cad70b0e2385 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpComponent; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java index 054ecd12090e7..093bbb58f1f78 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestParamType; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java index 88341e7bba0e9..a4f63c5d20e6e 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java index 18e0f5dbffd86..48ac674ee4680 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestParamType; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java index 7d551e678603e..5d85b41c0be65 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java @@ -17,10 +17,10 @@ package org.apache.camel.component.jetty.rest.producer; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jfr/pom.xml b/components/camel-jfr/pom.xml index 6e78574400560..3ce8a5b4099c0 100644 --- a/components/camel-jfr/pom.xml +++ b/components/camel-jfr/pom.xml @@ -47,7 +47,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jgroups-raft/pom.xml b/components/camel-jgroups-raft/pom.xml index 57c4ace9aab6c..af0a71b1a895d 100644 --- a/components/camel-jgroups-raft/pom.xml +++ b/components/camel-jgroups-raft/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java index c50ffe1c49340..388b58423e3e5 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jgroups.raft.RaftHandle; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java index 5f950926b9101..a3a20b17e3023 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jgroups.raft.utils.NopStateMachine; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.raft.RaftHandle; import org.junit.jupiter.api.Test; diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java index 07c38ab09da87..1f627a0f1c26a 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jgroups.raft.utils.NopStateMachine; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java index 09132523f74d7..af6901317e124 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jgroups.raft.utils.NopStateMachine; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.raft.RaftHandle; import org.jgroups.raft.StateMachine; diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml index 8dcc97cd0f17f..265ee3754bd89 100644 --- a/components/camel-jgroups/pom.xml +++ b/components/camel-jgroups/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java index edfa388c5f3b8..4c288c2e90825 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.Message; import org.jgroups.ObjectMessage; diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java index 163bdae92bb10..892e2ee92e17d 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.Message; import org.jgroups.ObjectMessage; diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java index daecac51cfc1d..fcfa2bb564425 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java @@ -19,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.Message; import org.jgroups.ObjectMessage; diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java index 74877b3e06c52..e7cb7ca470a80 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jgroups; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; 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 6a968e5bc11d3..d608b84799276 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 @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.Message; import org.jgroups.Receiver; diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java index 6f7e5582f2c56..2010ac26b8452 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml index d26eec150c7f0..a350fdbc1d3ec 100644 --- a/components/camel-jira/pom.xml +++ b/components/camel-jira/pom.xml @@ -128,7 +128,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java index 05ceaf2f7bf79..d6580cec07a80 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jira; import com.google.common.base.Joiner; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java index c56852e85d784..b93db398dc6a1 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java @@ -35,7 +35,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java index 9f019c6eb0126..580b952ad304c 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java @@ -38,7 +38,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.jupiter.api.Assertions; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/WatchUpdatesConsumerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/WatchUpdatesConsumerTest.java index 5cc8e7f7f249a..672902774d954 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/WatchUpdatesConsumerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/WatchUpdatesConsumerTest.java @@ -37,7 +37,7 @@ import org.apache.camel.component.jira.JiraConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java index f770718a0c2e6..79e8c95e6d8ce 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java @@ -34,7 +34,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java index 6b39b8f0606eb..2744e630104eb 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java @@ -37,7 +37,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -53,8 +53,8 @@ import static org.apache.camel.component.jira.Utils.createIssue; import static org.apache.camel.component.jira.Utils.createIssueWithLinks; import static org.apache.camel.component.jira.Utils.newIssueLink; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.lenient; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java index 32f0a66c6edd4..005aa75dda075 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java @@ -46,7 +46,7 @@ import org.apache.camel.component.jira.Utils; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java index b227add2a3739..0cf40ecaf0995 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java @@ -39,7 +39,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -54,8 +54,8 @@ import static org.apache.camel.component.jira.Utils.createIssueWithComments; import static org.apache.camel.component.jira.Utils.createIssueWithWorkLogs; import static org.apache.camel.component.jira.Utils.newWorkLog; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerFromFileRouteTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerFromFileRouteTest.java index fb25a6fc381b3..b997b5a1d73a6 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerFromFileRouteTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerFromFileRouteTest.java @@ -39,7 +39,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerInputStreamTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerInputStreamTest.java index 745907880aeab..6acc2cfdeb1b7 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerInputStreamTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerInputStreamTest.java @@ -36,7 +36,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java index 3b15d3f47410c..00357bf54a929 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java @@ -39,7 +39,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java index 1dc414b22094e..c4b5c3688322e 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java index 6d35dee8e8c6e..08426b089394f 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -40,8 +40,8 @@ import static org.apache.camel.component.jira.JiraConstants.JIRA; import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY; import static org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.lenient; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java index 836c2d7b3915f..5712803e69c5d 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -40,8 +40,8 @@ import static org.apache.camel.component.jira.JiraConstants.JIRA; import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY; import static org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.lenient; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java index 2f14380ce32e4..12ae454fc6ae3 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java @@ -34,7 +34,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java index 52e7dde9d9fb0..f386a15ac2eb6 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java @@ -46,7 +46,7 @@ import org.apache.camel.component.jira.Utils; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java index b4641f5179b54..19a6b26131df0 100644 --- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java +++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java @@ -39,7 +39,7 @@ import org.apache.camel.component.jira.JiraComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 3e0af5d13ca6b..14f75a2baa061 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -92,7 +92,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java index 425c2899e231b..cfc0adb048245 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java @@ -23,7 +23,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java index fe70bcdd86590..ec35092605454 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; import org.springframework.jms.core.JmsTemplate; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java index d577ac7c04526..a1eab1ff0ecc1 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; import org.springframework.jms.core.JmsTemplate; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java index 839d6536a4310..fd4d15b01e3be 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.jms.core.JmsTemplate; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java index 4feb45f412bdd..5e12468eb957a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java index d5a9424446ca7..9f32d417217af 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java index 88b41be039695..ba73692730d61 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java index b56f0453593a2..8d3018001ecc8 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentIbmMQTest.java @@ -24,7 +24,7 @@ import org.apache.camel.test.infra.ibmmq.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.ibmmq.services.IbmMQService; import org.apache.camel.test.infra.ibmmq.services.IbmMQServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java index d6950e450ccd6..a9fced72216bb 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java @@ -23,7 +23,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.Timeout; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java index c1966a560cb7e..fdf2b459e6fec 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java @@ -31,7 +31,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.concurrent.ThreadHelper; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java index f6c7d2b25a539..4b5f451821a59 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java @@ -49,7 +49,7 @@ import org.springframework.jms.listener.SimpleMessageListenerContainer; import org.springframework.jms.support.converter.SimpleMessageConverter; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java index ac4e9214f62ca..e50e3fd9d5344 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java @@ -26,7 +26,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisVMService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java index a329ec7423769..4634335b679f3 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java @@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java index fb753ef982293..f78ba2fc044cb 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java index 34a59c2fbc4cd..c0078ec99f90b 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.parallel.Isolated; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; @Isolated("Creates multiple threads") public class JmsProducerConcurrentTest extends AbstractJMSTest { diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java index 3beee6f0fc8e7..4a69a38f8ca99 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java @@ -37,7 +37,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.parallel.Isolated; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; @Timeout(60) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java index abbcdfc23ddc4..1ef4f6bcd4233 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java index 6aecef6ba2204..e5e6a4b563bb0 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @@ -40,7 +40,7 @@ import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java index 6dbe5692c6554..fc1d0512d3a66 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java index 70b1da49da1d9..ee8f39ed7ef51 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; import static org.apache.camel.component.jms.JmsConstants.JMS_X_GROUP_ID; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; @Timeout(20) public class JmsRouteUsingJMSXGroupTest extends AbstractJMSTest { diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java index 4eae1e77a62a3..15b117f99498a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java @@ -33,7 +33,7 @@ import org.springframework.jms.listener.AbstractMessageListenerContainer; import org.springframework.jms.listener.DefaultMessageListenerContainer; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java index d404cbd4f1b7d..1d1ed258d95e1 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java @@ -37,8 +37,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java index 9832d207005fc..abfd484336801 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java @@ -37,8 +37,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTestConnectionOnStartupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTestConnectionOnStartupTest.java index 00c8bd90ccff4..bd3c041adfec0 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTestConnectionOnStartupTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTestConnectionOnStartupTest.java @@ -22,11 +22,11 @@ import org.apache.camel.CamelContext; import org.apache.camel.FailedToCreateProducerException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java index 3194b7c4540fd..73441f6d68b1e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java @@ -36,7 +36,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.test.infra.artemis.services.RestartAwareArtemisContainer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.json.JsonObject; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java index 0a4ba45e07cd8..cd8dc2fdbe9db 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class AsyncJmsInOutTest extends AbstractJMSTest { diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsKeepLastModifiedIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsKeepLastModifiedIT.java index babd844399ec5..da20ac6445b13 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsKeepLastModifiedIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsKeepLastModifiedIT.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; public class FileRouteJmsKeepLastModifiedIT extends AbstractJMSTest { diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsPreMoveIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsPreMoveIT.java index 64455cf9aefa5..7892a4e083f0e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsPreMoveIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteJmsPreMoveIT.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsIT.java index 5d302d3614c3f..b24a0ee1399b8 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsIT.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Unit test that we can produce JMS message from files diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsToFileIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsToFileIT.java index a3dc32bb5947a..807c351bbec1a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsToFileIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/FileRouteToJmsToFileIT.java @@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsLoadBalanceFailOverIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsLoadBalanceFailOverIT.java index 7e66ab0d17ffd..306f5f60d3bfd 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsLoadBalanceFailOverIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsLoadBalanceFailOverIT.java @@ -24,7 +24,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsRouteToFileIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsRouteToFileIT.java index 3729b00168662..bbf3905398c30 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsRouteToFileIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsRouteToFileIT.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsXMLRouteIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsXMLRouteIT.java index ac9161fff70d1..188410cfb1c4b 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsXMLRouteIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/JmsXMLRouteIT.java @@ -37,7 +37,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java index 1fc96840e4fd0..c088b6455bfbd 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/TwoEmbeddedActiveMQBrokersIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/TwoEmbeddedActiveMQBrokersIT.java index e52dc1df6a519..f59accbab20a6 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/TwoEmbeddedActiveMQBrokersIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/TwoEmbeddedActiveMQBrokersIT.java @@ -19,7 +19,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisVMService; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.xbean.spring.context.ClassPathXmlApplicationContext; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java index 1768689abc54a..2cb58fb999f28 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/consumers/TwoConsumerOnSameQueueIT.java @@ -27,7 +27,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Tag; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/AdviceWithIssueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/AdviceWithIssueIT.java index 59772e5090c7a..02966505fb523 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/AdviceWithIssueIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/AdviceWithIssueIT.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jms.JmsComponent; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/BeanExceptionIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/BeanExceptionIT.java index e3d69b963b8d5..0b45d6b40085b 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/BeanExceptionIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/BeanExceptionIT.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/DynamicRoutersWithJMSMessageLostHeadersIssueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/DynamicRoutersWithJMSMessageLostHeadersIssueIT.java index 7f08ded9cbabe..7f7887d482548 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/DynamicRoutersWithJMSMessageLostHeadersIssueIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/DynamicRoutersWithJMSMessageLostHeadersIssueIT.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Test for CAMEL-5381 diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java index 7d0abfb931864..4a5db671bb330 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/issues/JmsTypeConverterIssueIT.java @@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/mqseries/MQSeriesHeaderIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/mqseries/MQSeriesHeaderIT.java index 66c84983ba491..45d58b669f287 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/mqseries/MQSeriesHeaderIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/mqseries/MQSeriesHeaderIT.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertMessageHeader; +import static org.apache.camel.test.junit6.TestSupport.assertMessageHeader; /** * Let us test that a number of headers MQSeries doesn't like to be sent are excluded when forwarding a JMS message from diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java index 038caf5669581..870a6ad1a865f 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java index 026810164ee4d..1901ee27f3249 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisEmbeddedServiceBuilder; import org.apache.camel.test.infra.artemis.services.ArtemisService; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.xbean.spring.context.ClassPathXmlApplicationContext; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java index b90091b7ed6f1..d64d98b57703c 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Tags; import org.springframework.context.support.AbstractXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTransactionThrottlingRoutePolicyIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTransactionThrottlingRoutePolicyIT.java index 5ed67c101a07a..fac8509087a72 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTransactionThrottlingRoutePolicyIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTransactionThrottlingRoutePolicyIT.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @Tags({ @Tag("not-parallel"), @Tag("spring"), @Tag("tx") }) public class JMSTransactionThrottlingRoutePolicyIT extends AbstractSpringJMSITSupport { diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsTXForceShutdownIssueManualIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsTXForceShutdownIssueManualIT.java index 92f7b88b4e52d..c7c239aba6ca2 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsTXForceShutdownIssueManualIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsTXForceShutdownIssueManualIT.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jms.integration.spring.tx; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java index 10591e5451c85..a008a29f0d764 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Tag; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedMarkRollbackIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedMarkRollbackIT.java index b69c53ca0b636..d09c751624283 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedMarkRollbackIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedMarkRollbackIT.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/security/JmsToJmsTransactedSecurityIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/security/JmsToJmsTransactedSecurityIT.java index 0efe3860da034..014eb9637690c 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/security/JmsToJmsTransactedSecurityIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/security/JmsToJmsTransactedSecurityIT.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionIT.java index 0345d2f413309..29470a832c970 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedDeadLetterChannelHandlerRollbackOnExceptionIT.java @@ -27,7 +27,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedOnExceptionRollbackOnExceptionIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedOnExceptionRollbackOnExceptionIT.java index 55d2b55a9488d..4580a39ba0ece 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedOnExceptionRollbackOnExceptionIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/tx/JmsTransactedOnExceptionRollbackOnExceptionIT.java @@ -27,7 +27,7 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumerInOnlyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumerInOnlyTest.java index 85260d3bf8f27..a961b6b9d192d 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumerInOnlyTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumerInOnlyTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java index c05cf40c1de8d..b4db680eec114 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java index 1ec1ac7f4e8a1..8e5e211e3cde5 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java index d2cb350352913..a0d917cf69d6c 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToComponentEndlessLoopTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToComponentEndlessLoopTest.java index d041cc0ac2343..416956bef02fc 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToComponentEndlessLoopTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToComponentEndlessLoopTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java index 34d9fd48f9364..1f26b3ec4cc6c 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToIbmMQTest.java @@ -23,7 +23,7 @@ import org.apache.camel.test.infra.ibmmq.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.ibmmq.services.IbmMQService; import org.apache.camel.test.infra.ibmmq.services.IbmMQServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java index 1891af2eec8e5..70c3bd840c7c0 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java @@ -28,7 +28,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisVMService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedOnCompletionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedOnCompletionTest.java index 93d796268eecd..264bfb373ef6e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedOnCompletionTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedOnCompletionTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml index 3deebad2a098d..2b176c161d015 100644 --- a/components/camel-jmx/pom.xml +++ b/components/camel-jmx/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java index 3a9488990000f..100a3825d4779 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java @@ -21,7 +21,7 @@ import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CamelJmxConsumerObserveAttributeMatchStringDifferTest extends CamelTestSupport { diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java index 90b69382b1200..d3c5839b5a88f 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java @@ -21,7 +21,7 @@ import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CamelJmxConsumerObserveAttributeMatchStringTest extends CamelTestSupport { diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java index 956b14bd6be4a..f76ccf28fab7f 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java @@ -21,7 +21,7 @@ import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CamelJmxConsumerObserveAttributeTest extends CamelTestSupport { diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java index 1bf7cba82cca3..afd7ea13d1fb4 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class CamelJmxConsumerTest extends CamelTestSupport { diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index 5ffbdab472626..8ab09828c40e7 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java index 5c7944d39a279..619153ff6b14f 100644 --- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java +++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; 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 16b166c24af9b..4b6755cd139c5 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 @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRefTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRefTest.java index c1fd76b8afd07..ca00ff169e998 100644 --- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRefTest.java +++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRefTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java index 91cb3cc358765..2d803e4c71e6c 100644 --- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java +++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml index c1c172b945cce..fd3d46e75664e 100644 --- a/components/camel-jooq/pom.xml +++ b/components/camel-jooq/pom.xml @@ -67,12 +67,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java index 1bbc4d3b4ead9..778604acfe669 100644 --- a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java +++ b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java @@ -19,8 +19,8 @@ import java.nio.file.Files; import java.sql.Connection; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.jooq.DSLContext; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-joor/pom.xml b/components/camel-joor/pom.xml index 21c2456a4e00f..0521d2372a229 100644 --- a/components/camel-joor/pom.xml +++ b/components/camel-joor/pom.xml @@ -57,7 +57,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaBeanTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaBeanTest.java index 2f3569ad7d0bc..133d31927934d 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaBeanTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaBeanTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.language.joor.Java; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JavaBeanTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaLanguageTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaLanguageTest.java index 1b6ddff7dbdaf..7665b3545b2c1 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaLanguageTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaLanguageTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.language.java; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaTransformTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaTransformTest.java index 8a89ad0e430aa..d99b71a490f77 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaTransformTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/java/JavaTransformTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JavaTransformTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectTransformTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectTransformTest.java index 744495b745956..50d4518d1188e 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectTransformTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectTransformTest.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorBeanInjectTransformTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectVarTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectVarTest.java index e4f363f535c7d..07aee671cb638 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectVarTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanInjectVarTest.java @@ -19,7 +19,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorBeanInjectVarTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanTest.java index cddd82013d07e..3a6cef83b5e32 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorBeanTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Header; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorBeanTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCompileErrorTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCompileErrorTest.java index 0423b26ff1879..e51ac9da991d4 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCompileErrorTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCompileErrorTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.language.joor; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomAliasTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomAliasTest.java index 47e7582b6b10f..8d428749fcdbb 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomAliasTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomAliasTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorCustomAliasTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomImportsTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomImportsTest.java index fa4a957e526c6..a35c3e2f706e1 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomImportsTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorCustomImportsTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorCustomImportsTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorLanguageTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorLanguageTest.java index 85736152e1e0d..c1807a79339e1 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorLanguageTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorLanguageTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.language.joor; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorOptionalPredicateTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorOptionalPredicateTest.java index 0680c1ebbe3a8..58df0f8018647 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorOptionalPredicateTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorOptionalPredicateTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorOptionalPredicateTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java index 3c6d930a6cefa..a203faf1fe7c7 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorPreCompileFalseTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPredicateTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPredicateTest.java index e5b05e75be0b2..c835da7490f63 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPredicateTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPredicateTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorPredicateTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorScriptingLanguageTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorScriptingLanguageTest.java index 2c8e0a2d2cba2..b872014629f43 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorScriptingLanguageTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorScriptingLanguageTest.java @@ -21,7 +21,7 @@ import org.apache.camel.spi.Language; import org.apache.camel.spi.ScriptingLanguage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorStreamPredicateTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorStreamPredicateTest.java index f673d840d75e9..dfd8a6ce6e8cc 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorStreamPredicateTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorStreamPredicateTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorStreamPredicateTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformResourceTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformResourceTest.java index 32c5f665037aa..eaa0ecf30bde6 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformResourceTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformResourceTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorTransformResourceTest extends CamelTestSupport { diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformTest.java index bfea1ba1090dd..dcb219a46a15c 100644 --- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformTest.java +++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorTransformTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JoorTransformTest extends CamelTestSupport { diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index d2622227925ca..28dc5f5eeb52d 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -64,12 +64,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc b/components/camel-jpa/src/main/docs/jpa-component.adoc index d39dcf8625614..2c7a61b6370fd 100644 --- a/components/camel-jpa/src/main/docs/jpa-component.adoc +++ b/components/camel-jpa/src/main/docs/jpa-component.adoc @@ -304,8 +304,8 @@ but the following listed types were not enhanced at build time or at class load at org.springframework.transaction.support.TransactionTemplate.execute(TransactionTemplate.java:127) at org.apache.camel.processor.jpa.JpaRouteTest.cleanupRepository(JpaRouteTest.java:96) at org.apache.camel.processor.jpa.JpaRouteTest.createCamelContext(JpaRouteTest.java:67) - at org.apache.camel.test.junit5.CamelTestSupport.doSetUp(CamelTestSupport.java:238) - at org.apache.camel.test.junit5.CamelTestSupport.setUp(CamelTestSupport.java:208) + at org.apache.camel.test.junit6.CamelTestSupport.doSetUp(CamelTestSupport.java:238) + at org.apache.camel.test.junit6.CamelTestSupport.setUp(CamelTestSupport.java:208) -------------------------------------------------------------------------------------------------------------------------------------------------------- The problem here is that the source has been compiled or recompiled through diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java index 12283da28fffe..0e844b0149141 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java @@ -23,7 +23,7 @@ import org.apache.camel.Consumer; import org.apache.camel.examples.Address; import org.apache.camel.examples.Customer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java index c39b86e5008cd..c0c6ea6137be7 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.Persistence; import org.apache.camel.examples.SendEmail; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.orm.jpa.JpaTransactionManager; diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java index b91c9374a5fa3..37a12a6904ab7 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.Persistence; import org.apache.camel.examples.SendEmail; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.orm.jpa.JpaTransactionManager; diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java index df55a81ee24f1..c7e74fbf9db07 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java @@ -26,7 +26,7 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; public class JpaUsePersistTest extends AbstractJpaMethodTest { diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java index c2e2ebfe3e652..d5f637620b390 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java index c426326c142f9..ad58b0751555a 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.EntityManagerFactory; import org.apache.camel.examples.SendEmail; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.springframework.context.support.AbstractApplicationContext; @@ -31,7 +31,7 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractJpaTest extends CamelSpringTestSupport { diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java index 5668c5f6053e6..f9c0139087602 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java @@ -30,7 +30,7 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Unit test using jpa idempotent repository for the file consumer. diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java index 1cacd5eff71b8..e84e64cafa4b7 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java @@ -23,7 +23,7 @@ import org.apache.camel.examples.SendEmail; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class JpaFlushOnSendTest extends AbstractJpaTest { diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java index 661909c6feaa2..38788abae9080 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java index c8a007177db54..b0b2367873d77 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.examples.SendEmail; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; public class JpaProducerNoBodyTest extends AbstractJpaTest { diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java index 32f5eca1bb1e8..18f745501c0de 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.jpa.JpaEndpoint; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.examples.SendEmail; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/components/camel-jq/pom.xml b/components/camel-jq/pom.xml index 54422863202db..0ada82d9c54b2 100644 --- a/components/camel-jq/pom.xml +++ b/components/camel-jq/pom.xml @@ -70,7 +70,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqBeanTest.java b/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqBeanTest.java index 8fadf0f8bdb7e..f19eda976c45e 100644 --- a/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqBeanTest.java +++ b/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqBeanTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JqBeanTest extends CamelTestSupport { diff --git a/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqTestSupport.java b/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqTestSupport.java index d0c5566d5cfe6..2eecaf6d99312 100644 --- a/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqTestSupport.java +++ b/components/camel-jq/src/test/java/org/apache/camel/language/jq/JqTestSupport.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public abstract class JqTestSupport extends CamelTestSupport { public static final ObjectMapper MAPPER = new ObjectMapper(); diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index 16b870a71b667..e557df8e0abc3 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java index 18b6a0689f569..42f4d1b58c6b1 100644 --- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java +++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java @@ -32,7 +32,7 @@ import com.jcraft.jsch.Session; import com.jcraft.jsch.UserInfo; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.kex.KeyExchangeFactory; import org.apache.sshd.common.keyprovider.FileKeyPairProvider; @@ -49,8 +49,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; public abstract class ScpServerTestSupport extends CamelTestSupport { protected static final Logger LOG = LoggerFactory.getLogger(ScpServerTestSupport.class); diff --git a/components/camel-jslt/pom.xml b/components/camel-jslt/pom.xml index 03b3914d2e76d..6ace529405e03 100644 --- a/components/camel-jslt/pom.xml +++ b/components/camel-jslt/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test 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 d0ca46827cf82..b971123081a6a 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 @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 6258f40e626a8..5e86f59893d87 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 @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 0027aad469f31..84f079206bba9 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 @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 446b1db38be1c..6b7abcc04a738 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 @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 27ab9da65d935..52a122c71a48f 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 @@ -24,7 +24,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** 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 a2d96df54e73f..20af31fb2b012 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 @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 64aed15f6a4a8..3375298e659c2 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 @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltRefTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltRefTest.java index dd165edbae76f..95218070e2c44 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltRefTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltRefTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltSafeSerializationTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltSafeSerializationTest.java index a796712ed4bfc..6ad999afd9a28 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltSafeSerializationTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltSafeSerializationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltTemplateFromHeaderTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltTemplateFromHeaderTest.java index 80dc4ab2e56d1..17da2d9d30970 100644 --- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltTemplateFromHeaderTest.java +++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltTemplateFromHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsltTemplateFromHeaderTest extends CamelTestSupport { 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 5b40fbb66f5aa..5d7bf155dc304 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 @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-json-patch/pom.xml b/components/camel-json-patch/pom.xml index f52bd31ada55a..b652497a61f02 100644 --- a/components/camel-json-patch/pom.xml +++ b/components/camel-json-patch/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test 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 c6370efb2ee0b..a3e10df8a2aed 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 @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchRefTest.java b/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchRefTest.java index e611130077e33..7141ae67d95df 100644 --- a/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchRefTest.java +++ b/components/camel-json-patch/src/test/java/org/apache/camel/component/jsonpatch/JsonPatchRefTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.jsonpatch; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-json-validator/pom.xml b/components/camel-json-validator/pom.xml index a76906147eec9..30f11e5eb3ef3 100644 --- a/components/camel-json-validator/pom.xml +++ b/components/camel-json-validator/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java index ea62864bfa309..9988220be1b26 100644 --- a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java +++ b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/FileValidatorRouteTest.java @@ -22,11 +22,11 @@ import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertTrue; public class FileValidatorRouteTest extends CamelTestSupport { diff --git a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/LocalRefSchemaTest.java b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/LocalRefSchemaTest.java index 5d296bed69832..5e99be1b120ce 100644 --- a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/LocalRefSchemaTest.java +++ b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/LocalRefSchemaTest.java @@ -19,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class LocalRefSchemaTest extends CamelTestSupport { diff --git a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorDeserializationFeaturesTest.java b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorDeserializationFeaturesTest.java index 1fbf6e0fdfd37..b61e1e689457e 100644 --- a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorDeserializationFeaturesTest.java +++ b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorDeserializationFeaturesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ValidatorDeserializationFeaturesTest extends CamelTestSupport { diff --git a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java index f3d8f440ed6fc..51fa9143254cb 100644 --- a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java +++ b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorInputStreamTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ValidatorInputStreamTest extends CamelTestSupport { diff --git a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java index 8f915ad6c9b79..80a86b28615b9 100644 --- a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java +++ b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jsonapi/pom.xml b/components/camel-jsonapi/pom.xml index 36673577e93b2..0d723ec18b3fc 100644 --- a/components/camel-jsonapi/pom.xml +++ b/components/camel-jsonapi/pom.xml @@ -51,12 +51,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jsonapi/src/test/java/org/apache/camel/component/jsonapi/JsonApiDataFormatTest.java b/components/camel-jsonapi/src/test/java/org/apache/camel/component/jsonapi/JsonApiDataFormatTest.java index f24ff5f3103c7..2a72d8cea8fe4 100644 --- a/components/camel-jsonapi/src/test/java/org/apache/camel/component/jsonapi/JsonApiDataFormatTest.java +++ b/components/camel-jsonapi/src/test/java/org/apache/camel/component/jsonapi/JsonApiDataFormatTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonata/pom.xml b/components/camel-jsonata/pom.xml index 0e4d04f50077d..03847515d05fb 100644 --- a/components/camel-jsonata/pom.xml +++ b/components/camel-jsonata/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test 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 54388a4310cda..6b3d357b06e60 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 @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 bb8e154cde2ee..66b3384a59178 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 @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 0680aeded4c09..9c0e2db710c10 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 @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 038248a7408ee..759dbd64e236b 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 @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 d3bdc6f31b537..55b585d86cd81 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 @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; 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 52865c22184b3..fe3399b380cb1 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 @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-jsonb/pom.xml b/components/camel-jsonb/pom.xml index 54a7b59cd6604..eff8eed96e9b0 100644 --- a/components/camel-jsonb/pom.xml +++ b/components/camel-jsonb/pom.xml @@ -68,7 +68,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java index c8d5b3161197c..000fdc45fad59 100644 --- a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java +++ b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbMarshalTest.java b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbMarshalTest.java index 92cabae5b3af4..ecead4e1a8824 100644 --- a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbMarshalTest.java +++ b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbMarshalTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbSkipNullTest.java b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbSkipNullTest.java index 038675b13dfcb..23a79bf6869fa 100644 --- a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbSkipNullTest.java +++ b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbSkipNullTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonbSkipNullTest extends CamelTestSupport { diff --git a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/SpringJsonbJsonDataFormatTest.java b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/SpringJsonbJsonDataFormatTest.java index 54fcc1e1fa8fd..e016a9e2c6dad 100644 --- a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/SpringJsonbJsonDataFormatTest.java +++ b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/SpringJsonbJsonDataFormatTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml index d13d7751cbcd9..7b084719fbb80 100644 --- a/components/camel-jsonpath/pom.xml +++ b/components/camel-jsonpath/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java index 2e76280acfdd3..c135b91622417 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java @@ -21,7 +21,7 @@ import com.jayway.jsonpath.Option; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathBeanStreamCachingTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java index 7695935a9fa19..4e6fb8415de1a 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathBeanSuppressExceptionsTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java index 2356af1f46ab2..cd6db76bb88c9 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java @@ -19,7 +19,7 @@ import com.jayway.jsonpath.Option; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathBeanTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java index e24ad589d77cb..3f5c30d32db0e 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.PredicateBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathCBRTest extends CamelTestSupport { 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 573e76def6dfa..95c8b877f615b 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 @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoicePrimitiveTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoicePrimitiveTest.java index 7dd257c3cbb8d..51959ce150828 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoicePrimitiveTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoicePrimitiveTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathChoicePrimitiveTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoiceReaderTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoiceReaderTest.java index 2e0a0e26c9d8a..2adbd416f058c 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoiceReaderTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathChoiceReaderTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.stream.ReaderCache; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathChoiceReaderTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCustomMapperTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCustomMapperTest.java index 6518c05bde51e..86353c67e31f9 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCustomMapperTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCustomMapperTest.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExchangePropertyTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExchangePropertyTest.java index c3dc1e27329f4..4de1e9a1f7126 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExchangePropertyTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExchangePropertyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExpressionPojoTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExpressionPojoTest.java index 8848b65d6a634..e5dc216fb4607 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExpressionPojoTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathExpressionPojoTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jackson.JacksonConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathExpressionPojoTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java index b17a34a257b63..e4a779d14b19a 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathHeaderNameTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java index e0c582c2435b3..f0cc28c55fa12 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Predicate; import org.apache.camel.spi.Language; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLeafNullTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLeafNullTest.java index ebb4ec1d941fc..d625f12777021 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLeafNullTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLeafNullTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathLeafNullTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java index 241bc69e957a8..654b0583b4d8a 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java @@ -25,10 +25,10 @@ import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class JsonPathMapTransformTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java index 7aa9050df63d6..6a9b454c22704 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathMockMatchesTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathNullHeaderTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathNullHeaderTest.java index 9362d89735f95..cf79209274291 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathNullHeaderTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathNullHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathNullHeaderTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java index 1e71ef364e274..ee81bec589005 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServerConfiguration; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java index 983489e8f8914..42c6bb6471f69 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathPojoTransformTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPredicateJsonSmartTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPredicateJsonSmartTest.java index 8690f49f0bb9b..a747d06a2b2b2 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPredicateJsonSmartTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPredicateJsonSmartTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Predicate; import org.apache.camel.spi.Language; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockFunctionTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockFunctionTest.java index 195a40ce2fd8c..2ac9ef3dbb9fd 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockFunctionTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockFunctionTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSimpleInitBlockFunctionTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockTest.java index ff85426c7e44a..03aca4f59e211 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleInitBlockTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSimpleInitBlockTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleSetVariableTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleSetVariableTest.java index a3a4afaf652f8..67f23feab29d0 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleSetVariableTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleSetVariableTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSimpleSetVariableTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTest.java index 04fba80e0778a..d035b5f8d2e49 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSimpleTransformTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTwoTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTwoTest.java index 7da3560045af4..dc7af3ea413ef 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTwoTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSimpleTransformTwoTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSimpleTransformTwoTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java index b4450ab42f2b3..e53cb9c67cdb3 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.file.FileConsumer; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitMultipleListTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitMultipleListTest.java index ec6b818e09ca7..6ef86405af358 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitMultipleListTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitMultipleListTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java index 8c624dd20a216..12e66ead0199a 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.language.JsonPathExpression; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java index 9325c3a97cbfe..365f3aa0698ca 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java index 24deca5fb7e4d..66ed3b0df4573 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java index 17d2dd1addf5b..de6c09d0665d7 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringResultTypeStringTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringResultTypeStringTest.java index 73559ac61b8da..9a8c3e784b13c 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringResultTypeStringTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringResultTypeStringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSplitWriteAsStringResultTypeStringTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java index 020b9b567204d..92a249f60b71b 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSplitWriteAsStringTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java index 6dd778983caa6..ebf4d6a8bbfe1 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.PredicateBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathStreamCachingCBRTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java index ac6e1300bd62f..ae86f2cc0bae0 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathSuppressTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java index 6b3d36ee3b23c..7c78f36af766c 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielEscapedTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielEscapedTest.java index f58061e38b515..7980b426d974a 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielEscapedTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielEscapedTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielPlaceholderTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielPlaceholderTest.java index 8a88d6d4cc60b..4d8773d3d0eb7 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielPlaceholderTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielPlaceholderTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.PropertiesComponent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielTest.java index 91565e4842fe8..aa99f041ef60c 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformONielTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java index 5557394e6624d..2a90a72b537f3 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathTransformResultTypeTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java index c1da1d3f631df..3ecbed176aa21 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathVariableTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathVariableTest.java index 80dca8f0c1112..dc362bdef199f 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathVariableTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathVariableTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathVariableTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java index 603898a8e1768..f18ab438a067f 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class JsonPathWithSimpleCBRTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java index 8a76bdd2c68d0..cc6542cb05d18 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java @@ -19,7 +19,7 @@ import java.io.File; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCustomReadMapperBeanTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCustomReadMapperBeanTest.java index ec244a3a15e74..8e5bd5e868db8 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCustomReadMapperBeanTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCustomReadMapperBeanTest.java @@ -19,7 +19,7 @@ import java.io.File; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java index ec062a48f5a62..56e026029a4ac 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java @@ -19,7 +19,7 @@ import java.io.File; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java index d5f34ecef9a03..623f8337a04fc 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java @@ -17,7 +17,7 @@ package org.apache.camel.jsonpath; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java index 7f0d42b0c8feb..f752e9f44f6f0 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java index 18e7cb9b11742..9b1dd3961dfed 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java @@ -19,7 +19,7 @@ import java.io.File; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java index 553ac0398a18d..69751edec5e77 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java index a65d0e85473f4..4146b1fcdbd0a 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class EasyJsonPathWithRootSimpleCBRTest extends CamelTestSupport { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java index 11c2cd41e5e0c..70c6dc4b54c1a 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class EasyJsonPathWithSimpleCBRTest extends CamelTestSupport { diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index 78aa52efe7330..05fb5b3000d35 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerManualTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerManualTest.java index 44dba3a34967b..d29e933e2d24a 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerManualTest.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerManualTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; 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 6ef64a1895bcf..f090c4340ef3a 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 @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** 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 bb5a3abfd8b00..4279857f5d68a 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 @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; 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 c88c4d14ed9e2..9385c7751c21d 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 @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java index 8ec80d8cfe4d6..7dcaeb53b6aff 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java @@ -18,7 +18,7 @@ import com.ibm.as400.access.AS400ConnectionPool; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; /** diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java index ccdcd2d28999b..ac3798835af98 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java @@ -18,7 +18,7 @@ import com.ibm.as400.access.AS400ConnectionPool; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; /** diff --git a/components/camel-jte/pom.xml b/components/camel-jte/pom.xml index 8adf8848bb4c9..822d7e6f94c9d 100644 --- a/components/camel-jte/pom.xml +++ b/components/camel-jte/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteDataModelTest.java b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteDataModelTest.java index 2a501db792ee9..569b21bd9fbd7 100644 --- a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteDataModelTest.java +++ b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteDataModelTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteRefTest.java b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteRefTest.java index 891673ab269b9..3dbada8c16a0d 100644 --- a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteRefTest.java +++ b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteRefTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTemplateFromHeaderTest.java b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTemplateFromHeaderTest.java index d152314e807dd..9d625a13a7a33 100644 --- a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTemplateFromHeaderTest.java +++ b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTemplateFromHeaderTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTest.java b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTest.java index 13fe15003b95f..7e30b53b28c8a 100644 --- a/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTest.java +++ b/components/camel-jte/src/test/java/org/apache/camel/component/jte/JteTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index 50944df10c0f4..45a17fa91f07f 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -89,7 +89,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test @@ -131,12 +131,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithLoopTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithLoopTest.java index fae1d63f6cf14..3712d982f3290 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithLoopTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithLoopTest.java @@ -24,7 +24,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.common.serialization.StringSerializer; import org.junit.jupiter.api.MethodOrderer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java index c59b14a90def1..014ce25f996e2 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java @@ -25,7 +25,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.common.serialization.StringSerializer; import org.junit.jupiter.api.MethodOrderer; diff --git a/components/camel-kamelet/pom.xml b/components/camel-kamelet/pom.xml index d2237b7b3e3fd..52ebfa22c66a5 100644 --- a/components/camel-kamelet/pom.xml +++ b/components/camel-kamelet/pom.xml @@ -101,7 +101,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletAggregateTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletAggregateTest.java index 898978f6d11e0..939e4427fb0ed 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletAggregateTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletAggregateTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.AggregationStrategies; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java index 5bafe505eb924..081da0e813d3d 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBeanWithParametrizedConstructorTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBeanWithParametrizedConstructorTest.java index 6d07f56abf10b..4b963694d6243 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBeanWithParametrizedConstructorTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBeanWithParametrizedConstructorTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletBeanWithParametrizedConstructorTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConcurrencyIssueTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConcurrencyIssueTest.java index fff35e694924a..ca79cc1945bec 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConcurrencyIssueTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConcurrencyIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumeOnlyTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumeOnlyTest.java index d9a7261211d29..2148b27939b6e 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumeOnlyTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumeOnlyTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumerUoWIssueTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumerUoWIssueTest.java index 0ef494548d4c2..e2bf3ebdf8cc9 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumerUoWIssueTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletConsumerUoWIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.SynchronizationAdapter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletConsumerUoWIssueTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletDiscoveryTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletDiscoveryTest.java index 1840fb57310ba..f6ca2f6ad7f8b 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletDiscoveryTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletDiscoveryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.impl.engine.DefaultRoutesLoader; import org.apache.camel.spi.Resource; import org.apache.camel.support.RoutesBuilderLoaderSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateGroovyTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateGroovyTest.java index ad72c5e2d6c40..5f9ac8d7c353c 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateGroovyTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateGroovyTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletEipAggregateGroovyTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateJoorTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateJoorTest.java index c38d49229fdfe..40abfb888af47 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateJoorTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateJoorTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletEipAggregateJoorTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateTest.java index dca394c9fac63..a99ab7ffbf4a7 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipAggregateTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.AggregationStrategies; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletEipAggregateTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipFilterTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipFilterTest.java index da8f0ca7a8232..7b848af99f9fa 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipFilterTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipFilterTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletEipFilterTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipMulticastTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipMulticastTest.java index 5b09d4bab01ec..9a5ee1b399569 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipMulticastTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipMulticastTest.java @@ -22,7 +22,7 @@ import org.apache.camel.model.MulticastDefinition; import org.apache.camel.model.ProcessorDefinitionHelper; import org.apache.camel.model.RouteDefinition; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipNoChildrenTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipNoChildrenTest.java index 60899c6d11111..99a97e9eddd8d 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipNoChildrenTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipNoChildrenTest.java @@ -18,7 +18,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java index a258014d195a6..a34fac8c47743 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletEipSplitTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipTest.java index fd90a57323011..12b53cce98083 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletEipTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnrichTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnrichTest.java index efcbd2e16ad35..d495c2b73ff39 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnrichTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnrichTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnvTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnvTest.java index cb195c991e7b7..354227d897f24 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnvTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEnvTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Resource; import org.apache.camel.spi.RoutesBuilderLoader; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletGlobalPropertiesTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletGlobalPropertiesTest.java index 3a899d04c7f21..93699ff20a92b 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletGlobalPropertiesTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletGlobalPropertiesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.util.PropertiesHelper.asProperties; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletHttpSinkTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletHttpSinkTest.java index afded2f1787cf..1796a2b92b236 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletHttpSinkTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletHttpSinkTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletHttpSinkTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassFourTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassFourTest.java index c9cfc160cefe2..d917b8c08f52b 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassFourTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassFourTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanClassFourTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTest.java index bd3303b20de51..36eddd33ba10c 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanClassTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassThreeTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassThreeTest.java index d91944240de41..0f7d7785e451d 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassThreeTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassThreeTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanClassThreeTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTwoTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTwoTest.java index 8e7bbabf2abb9..6774c9b96c5c3 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTwoTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanClassTwoTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanClassTwoTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanConfigureTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanConfigureTest.java index 12184762d66e7..890c02c0829b8 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanConfigureTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanConfigureTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanConfigureTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyExternalTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyExternalTest.java index 4a94b14b6ac51..a533d2f864d43 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyExternalTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyExternalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanGroovyExternalTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java index b71ad42e16499..58dc5d44350e9 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanGroovyTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanInitDestroyTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanInitDestroyTest.java index cd042bf17940c..8e2cfa4ac87a5 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanInitDestroyTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanInitDestroyTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanIoCTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanIoCTest.java index b15d4bfa412fd..06ba51df24f8f 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanIoCTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanIoCTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanIoCTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanJoorExternalTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanJoorExternalTest.java index bb86368242abf..887320a61fd41 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanJoorExternalTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanJoorExternalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanLanguageTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanLanguageTest.java index c2f3a368666b9..1c577c3ac7811 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanLanguageTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanLanguageTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanLanguageTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanSupplierTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanSupplierTest.java index 0e4a3d9e51bd2..98e96a079baf1 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanSupplierTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanSupplierTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanSupplierTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTest.java index c83d90d60001e..f0ec0b4892a57 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTypeTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTypeTest.java index 75552f818beee..527072ebc7962 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTypeTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanTypeTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocalBeanTypeTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocationTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocationTest.java index 5c581acd366db..cc07db973b759 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocationTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Resource; import org.apache.camel.spi.RoutesBuilderLoader; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletLocationTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerRouteConfigurationTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerRouteConfigurationTest.java index 5bc4891e8cf72..3c223a2344270 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerRouteConfigurationTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerRouteConfigurationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteConfigurationBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletNoErrorHandlerRouteConfigurationTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerTest.java index 6f47af18db429..c08411e3bef89 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletNoErrorHandlerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletNoErrorHandlerTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPollEnrichTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPollEnrichTest.java index 33e5b846c05e4..c3f4838427984 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPollEnrichTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPollEnrichTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropagateVariableAsResultTestTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropagateVariableAsResultTestTest.java index 1b1612cbc0726..1532bd4f6297d 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropagateVariableAsResultTestTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropagateVariableAsResultTestTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletPropagateVariableAsResultTestTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRecipientListTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRecipientListTest.java index b8e692427c101..8c48fc28374eb 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRecipientListTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRecipientListTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletRecipientListTest extends CamelTestSupport { 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 a3c84888386f8..41a434475c5d8 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 @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteSingleTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteSingleTest.java index 13eea44ca3d27..830f9ffb15e0b 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteSingleTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteSingleTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java index 052e09311b86b..48772959fab6d 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletShutdownToDTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletShutdownToDTest.java index 31892e1d0ea14..ff1f96c92dbad 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletShutdownToDTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletShutdownToDTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletShutdownToDTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSinkDeadLetterChannelTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSinkDeadLetterChannelTest.java index fd6f95b5072b4..2f244a46ffc4f 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSinkDeadLetterChannelTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSinkDeadLetterChannelTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletSinkDeadLetterChannelTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceBridgeErrorHandlerTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceBridgeErrorHandlerTest.java index 0e1e251f1ec07..9516b04c884c9 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceBridgeErrorHandlerTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceBridgeErrorHandlerTest.java @@ -32,7 +32,7 @@ import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.DefaultConsumer; import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceDeadLetterChannelTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceDeadLetterChannelTest.java index d6f03b01b4e12..2089142a45ae7 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceDeadLetterChannelTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletSourceDeadLetterChannelTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletSourceDeadLetterChannelTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletToDTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletToDTest.java index 75d23e2da2fcd..13319244a3496 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletToDTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletToDTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletToDTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletTryCatchTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletTryCatchTest.java index f7aad8bf08ddb..60c452e162ba8 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletTryCatchTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletTryCatchTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletTryCatchTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletUoWIssueTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletUoWIssueTest.java index eda294564d4b3..0901410ed44b3 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletUoWIssueTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletUoWIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.SynchronizationAdapter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletUoWIssueTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletVariableReceiveTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletVariableReceiveTest.java index ec3e4585ea237..c9147a0f6eaff 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletVariableReceiveTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletVariableReceiveTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletWireTapTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletWireTapTest.java index c6856bf523241..efc4d863be9c1 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletWireTapTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletWireTapTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class KameletWireTapTest extends CamelTestSupport { diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteDisabledTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteDisabledTest.java index bfa26bd1990b3..98c4167f875e7 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteDisabledTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteDisabledTest.java @@ -25,7 +25,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StringHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteEnabledTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteEnabledTest.java index 81df1c2d597f3..2499bafcbf33b 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteEnabledTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/ManagedKameletRouteEnabledTest.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StringHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/TemplatedRouteKameletTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/TemplatedRouteKameletTest.java index fb466e735370b..5441686044ad9 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/TemplatedRouteKameletTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/TemplatedRouteKameletTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class TemplatedRouteKameletTest extends CamelTestSupport { diff --git a/components/camel-keycloak/pom.xml b/components/camel-keycloak/pom.xml index a5c1f4205973d..341dca6734392 100644 --- a/components/camel-keycloak/pom.xml +++ b/components/camel-keycloak/pom.xml @@ -72,7 +72,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakComponentTest.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakComponentTest.java index 0996406169d10..bfcacc9305ee2 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakComponentTest.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakComponentTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.keycloak; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.mockito.Mockito; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java index 6f8b86fcf1525..0bb0977e51c47 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.keycloak.services.KeycloakService; import org.apache.camel.test.infra.keycloak.services.KeycloakServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerTest.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerTest.java index c3480e38472e0..3ec2c39105786 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerTest.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerIT.java index c4743b763440f..4c29d16ee6f46 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerIT.java @@ -27,8 +27,8 @@ import org.apache.camel.Exchange; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerTest.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerTest.java index 829539c08bb17..71331c02844b6 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerTest.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakProducerTest.java @@ -24,7 +24,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientsResource; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java index 400119cf8783c..cd7dacb39a2d9 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java @@ -27,8 +27,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.keycloak.services.KeycloakService; import org.apache.camel.test.infra.keycloak.services.KeycloakServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java index 2688a3d771f60..ed9d553e9881f 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java @@ -36,7 +36,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityPolicyTest.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityPolicyTest.java index de5d11ee96421..7137d9e3e74a9 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityPolicyTest.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityPolicyTest.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java index d14fae2740882..375fa9ab7696f 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java @@ -41,7 +41,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.keycloak.services.KeycloakService; import org.apache.camel.test.infra.keycloak.services.KeycloakServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenBindingSecurityIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenBindingSecurityIT.java index 2ad15e060cffa..d1430cb8cf632 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenBindingSecurityIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenBindingSecurityIT.java @@ -34,7 +34,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.keycloak.services.KeycloakService; import org.apache.camel.test.infra.keycloak.services.KeycloakServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectionIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectionIT.java index 3cd43d13fee26..72715c0a2a077 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectionIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectionIT.java @@ -38,7 +38,7 @@ import org.apache.camel.component.keycloak.security.cache.TokenCacheType; import org.apache.camel.test.infra.keycloak.services.KeycloakService; import org.apache.camel.test.infra.keycloak.services.KeycloakServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; diff --git a/components/camel-knative/camel-knative-api/pom.xml b/components/camel-knative/camel-knative-api/pom.xml index 44da0f03a97d0..7929a5091f789 100644 --- a/components/camel-knative/camel-knative-api/pom.xml +++ b/components/camel-knative/camel-knative-api/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-knative/camel-knative-component/pom.xml b/components/camel-knative/camel-knative-component/pom.xml index fffdf36f96072..7b26eb0ac19f4 100644 --- a/components/camel-knative/camel-knative-component/pom.xml +++ b/components/camel-knative/camel-knative-component/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-knative/camel-knative-http/pom.xml b/components/camel-knative/camel-knative-http/pom.xml index 5ba244aad0453..610a98b79ed17 100644 --- a/components/camel-knative/camel-knative-http/pom.xml +++ b/components/camel-knative/camel-knative-http/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java index cf64d5c696f17..103845a526c40 100644 --- a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java +++ b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java @@ -51,6 +51,7 @@ import org.apache.camel.util.StringHelper; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -74,6 +75,11 @@ public class KnativeHttpTest { private int platformHttpPort; private String platformHttpHost; + @BeforeAll + public static void beforeAll() { + System.setProperty("io.netty.handler.ssl.defaultEndpointVerificationAlgorithm", "NONE"); + } + // ************************** // // Setup diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml index 7e9fb10045a4f..b26d0a3a8c20b 100644 --- a/components/camel-kubernetes/pom.xml +++ b/components/camel-kubernetes/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java index 57c619898a7ef..cb2f3aefc1b0e 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java @@ -21,7 +21,7 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteManualTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteManualTest.java index e2cf37be6c8c1..2695c10257c9c 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteManualTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteManualTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.kubernetes.KubernetesConfiguration; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteManualTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteManualTest.java index 156cd0566ef06..016c8d4306ed1 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteManualTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteManualTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteManualTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteManualTest.java index 450da35bfa8a7..b31dd5af8eb90 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteManualTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteManualTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.kubernetes.cloud; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteManualTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteManualTest.java index e9b8e7e0242ac..e6d267b457389 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteManualTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteManualTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.kubernetes.cloud; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteManualTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteManualTest.java index d7748f75450a4..f4df901899c31 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteManualTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteManualTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.kubernetes.cloud; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java index a3de888f4de55..1f6e986c31d9e 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java @@ -43,7 +43,7 @@ import org.apache.camel.component.kubernetes.cluster.utils.LockTestServer; import org.apache.camel.component.kubernetes.cluster.utils.ResourceLockSimulator; import org.apache.camel.support.cluster.RebalancingCamelClusterService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEndpointTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEndpointTest.java index 30a4fcefd1fb6..b5cdb0515f4b8 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEndpointTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEndpointTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.kubernetes.pods.KubernetesPodsComponent; import org.apache.camel.component.kubernetes.pods.KubernetesPodsEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretReloadTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretReloadTest.java index c83163d122bfd..4f095ccdd7754 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretReloadTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretReloadTest.java @@ -21,7 +21,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.spi.ContextReloadStrategy; import org.apache.camel.support.DefaultContextReloadStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-kudu/pom.xml b/components/camel-kudu/pom.xml index 3ecc42267628e..c74b41c1c8f59 100644 --- a/components/camel-kudu/pom.xml +++ b/components/camel-kudu/pom.xml @@ -103,7 +103,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/AbstractKuduTest.java b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/AbstractKuduTest.java index 8fdb10d88fcb5..c0ecb6f291c12 100644 --- a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/AbstractKuduTest.java +++ b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/AbstractKuduTest.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.List; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.kudu.ColumnSchema; import org.apache.kudu.Schema; import org.apache.kudu.Type; diff --git a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduComponentConfigurationTest.java b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduComponentConfigurationTest.java index 846706b885a31..5f7942d1c75a6 100644 --- a/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduComponentConfigurationTest.java +++ b/components/camel-kudu/src/test/java/org/apache/camel/component/kudu/KuduComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.kudu; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml index e05adbe88060d..e06cdb5e5131f 100644 --- a/components/camel-ldap/pom.xml +++ b/components/camel-ldap/pom.xml @@ -44,7 +44,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java index 4a4f98618622b..d94b418578c10 100644 --- a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java +++ b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java @@ -225,22 +225,22 @@ private void updateTlsKey(DirectoryService ds) throws LdapException { @Override public void beforeAll(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).beforeAll(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).beforeAll(context); } @Override public void beforeEach(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).beforeEach(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).beforeEach(context); } @Override public void afterEach(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).afterEach(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).afterEach(context); } @Override public void afterAll(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).afterAll(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).afterAll(context); } } diff --git a/components/camel-ldif/pom.xml b/components/camel-ldif/pom.xml index 53536081caf7f..3864d3669eee9 100644 --- a/components/camel-ldif/pom.xml +++ b/components/camel-ldif/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifTestSupport.java b/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifTestSupport.java index ececad0a8d70d..3cbab66c31820 100644 --- a/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifTestSupport.java +++ b/components/camel-ldif/src/test/java/org/apache/camel/component/ldif/LdifTestSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.test.infra.openldap.services.OpenldapService; import org.apache.camel.test.infra.openldap.services.OpenldapServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; public class LdifTestSupport extends CamelTestSupport { diff --git a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java index 0e63c92fb6e37..ef03da8ea981b 100644 --- a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java +++ b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java @@ -226,22 +226,22 @@ private void updateTlsKey(DirectoryService ds) throws LdapException { @Override public void beforeAll(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).beforeAll(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).beforeAll(context); } @Override public void beforeEach(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).beforeEach(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).beforeEach(context); } @Override public void afterEach(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).afterEach(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).afterEach(context); } @Override public void afterAll(ExtensionContext context) throws Exception { - context.getStore(NAMESPACE).getOrComputeIfAbsent(State.class).afterAll(context); + context.getStore(NAMESPACE).computeIfAbsent(State.class).afterAll(context); } } diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml index 0e4b194d9ecc4..f7f0b75ade1cb 100644 --- a/components/camel-leveldb/pom.xml +++ b/components/camel-leveldb/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java index aaf86637670fe..d5ad72971512d 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java @@ -22,11 +22,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateConcurrentDifferentGroupsTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java index 1f61ede327ca4..3eb0c60859b23 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java @@ -22,11 +22,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateConcurrentSameGroupTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java index 987a21b71660e..3c3218b3cc9dd 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java @@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.awaitility.Awaitility; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateDiscardOnTimeoutTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java index e7f483b80b5e4..4cba277599f49 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java @@ -22,11 +22,11 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * To test CAMEL-4118 support for completing all aggregation groups with a signal message diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java index 8ba1ee368a85c..183415fe75aaf 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java @@ -25,14 +25,14 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java index 7aef65e23a44c..cd675ddfe94d2 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java @@ -22,14 +22,14 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateLoadConcurrentTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java index 6953a81036610..fe09251d6f6c4 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java @@ -20,14 +20,14 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateLoadTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java index 6af08d4fef84f..67d77cb91afe2 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java @@ -23,14 +23,14 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.awaitility.Awaitility; import org.hamcrest.Matchers; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import static org.apache.camel.component.leveldb.LevelDBAggregationRepository.keyBuilder; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertNull; @DisabledOnOs({ OS.AIX, OS.OTHER }) diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java index 85d492a6a0bbf..2399edc0db36d 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java @@ -22,14 +22,14 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.awaitility.Awaitility; import org.hamcrest.Matchers; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import static org.apache.camel.component.leveldb.LevelDBAggregationRepository.keyBuilder; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java index c96c50b6d4efb..ae46fcb1d26b5 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java @@ -21,11 +21,11 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledOnOs({ OS.AIX, OS.OTHER }) diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java index 47775104f47aa..2f3873e85fa16 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java @@ -21,11 +21,11 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateRecoverDeadLetterChannelTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java index 470e96ac53dcd..960859ca37379 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java @@ -25,11 +25,11 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateRecoverTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java index 7d719edffb2f1..1aecb95ddd929 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java @@ -25,11 +25,11 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateRecoverWithRedeliveryPolicyTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java index beabdf77bd14a..ae30b41a369f5 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java @@ -25,11 +25,11 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateRecoverWithSedaTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java index 2aaa0b6805f07..50e660160e84e 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java @@ -22,14 +22,14 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.util.HeaderDto; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBAggregateSerializedHeadersTest extends LevelDBTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java index 41deaa1646d7c..b4c71c13d0af7 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java @@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledOnOs({ OS.AIX, OS.OTHER }) diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java index dafbe26870864..824d271a3dcf1 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java @@ -18,11 +18,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledOnOs({ OS.AIX, OS.OTHER }) diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java index 53438c76fc795..22ba5d791ca33 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java @@ -20,11 +20,11 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledOnOs({ OS.AIX, OS.OTHER }) diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java index 522045fa66d30..36ff502a07c1d 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java @@ -20,11 +20,11 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java index 0133d9efadd8e..a9920fde2b870 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java @@ -20,11 +20,11 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java index ba2b9fe907612..fcbce5ca81c5d 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java @@ -20,11 +20,11 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java index f36b89d333437..b8fd5be396b71 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java @@ -20,11 +20,11 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadManualTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadManualTest.java index 925e1f58e9f83..06ea6dbd97d54 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadManualTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadManualTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.condition.DisabledOnOs; @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java index 116998ee18355..5f76f1b6cdc7b 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java @@ -22,12 +22,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledOnOs({ OS.AIX, OS.OTHER }) diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java index 8ddc17870866c..92f0d4e0e906f 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java @@ -36,12 +36,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.leveldb.serializer.JacksonLevelDBSerializer; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledOnOs({ OS.AIX, OS.OTHER }) diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java index 3384d594b17cb..de60b0ad3ec5c 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java @@ -21,11 +21,11 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java index 37627cd83f79d..53fcb1f4263db 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java @@ -20,13 +20,13 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java index bdcc977ec1b7e..f29832fc70c1c 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java @@ -17,13 +17,13 @@ package org.apache.camel.component.leveldb; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBSetupTest extends CamelTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java index ae66bc184a58e..c7165c625d171 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; @@ -31,7 +31,7 @@ import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest extends CamelSpringTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java index c3e6360c48907..70ef28531157f 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java @@ -21,14 +21,14 @@ import org.apache.camel.AggregationStrategy; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @DisabledOnOs({ OS.AIX, OS.OTHER }) public class LevelDBSpringAggregateTest extends CamelSpringTestSupport { diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBTestSupport.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBTestSupport.java index be360e5db57d7..3a1a1f98ccc96 100644 --- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBTestSupport.java +++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBTestSupport.java @@ -25,10 +25,10 @@ import org.apache.camel.Exchange; import org.apache.camel.component.leveldb.serializer.DefaultLevelDBSerializer; import org.apache.camel.component.leveldb.serializer.JacksonLevelDBSerializer; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml index 08145fcbbea41..6767a8bfd44f9 100644 --- a/components/camel-lra/pom.xml +++ b/components/camel-lra/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java b/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java index 127ff3b4bcd00..7f9c352f31b97 100644 --- a/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java +++ b/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java @@ -29,7 +29,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRAService; import org.apache.camel.test.infra.microprofile.lra.services.MicroprofileLRAServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAClientTest.java b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAClientTest.java index e1cc66f8e93df..67eb73251ef9d 100644 --- a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAClientTest.java +++ b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAClientTest.java @@ -22,7 +22,7 @@ import java.net.http.HttpRequest; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualInMemoryTest.java b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualInMemoryTest.java index a9eae4170d6b4..4db03b163e129 100644 --- a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualInMemoryTest.java +++ b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualInMemoryTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.SagaCompletionMode; import org.apache.camel.saga.InMemorySagaService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class LRAManualInMemoryTest extends CamelTestSupport { diff --git a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java index e85ef43f19301..488f487a4b3ac 100644 --- a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java +++ b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaCoordinatorTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.saga.CamelSagaStep; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaServiceTest.java b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaServiceTest.java index 08c349de1bfe3..3365ba5a3a5d3 100644 --- a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaServiceTest.java +++ b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaServiceTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml index 4d3e9359eaf0c..0b3780e1f85ba 100644 --- a/components/camel-lucene/pom.xml +++ b/components/camel-lucene/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java index 0ebf87754870a..0d91b8b1ef84f 100644 --- a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java +++ b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.lucene.support.Hits; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.lucene.analysis.core.SimpleAnalyzer; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; diff --git a/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java b/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java index d8a05bfa3a642..c1a2d01780ca1 100644 --- a/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java +++ b/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.lucene.LuceneConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.lucene.support.Hits; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.junit.jupiter.api.Test; diff --git a/components/camel-lumberjack/pom.xml b/components/camel-lumberjack/pom.xml index 3658b2baa901c..83c510c265d1a 100644 --- a/components/camel-lumberjack/pom.xml +++ b/components/camel-lumberjack/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java index a24ee59b09b35..7b1f675f776ff 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java @@ -28,7 +28,7 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java index 4a459fe846345..a4a3abfa351e0 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java @@ -28,7 +28,7 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java index 30a05550b2c5c..d0ee3dbf59ad6 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java index 079599f94b047..2f4d379c52e4a 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java @@ -26,11 +26,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; public class LumberjackDisconnectionTest extends CamelTestSupport { private static int port; diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java index f5cf3a7a4de33..9fccdfd57db4c 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml index a017a25423d4e..2c38ca8390dff 100644 --- a/components/camel-lzf/pom.xml +++ b/components/camel-lzf/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -58,7 +58,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java b/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java index f0a6fe0e3c75d..e8ef62e25a854 100644 --- a/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java +++ b/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 281f75da05580..0b23bb56c3bf3 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java index 5b68965024ab7..85875420a15a4 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java index 3f06d75d9cf1e..b8ebc4ac78ecb 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java index a0379173ed4a2..d2225a8d8096c 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.mail; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java index 9310471afbb3d..7618339e1f7ee 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java index bc9eacff66df0..35efd10ec7d71 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.PollingConsumer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java index fd90250e557f1..2d8b7403b9054 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java index 28daf0c5858ce..093af0ce59410 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java @@ -37,7 +37,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java index d6f93411ddac9..e5fb9bbd79888 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java index 258cdf3214ff3..01ab6229e0c63 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java @@ -32,7 +32,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java index d0dc036634aeb..c02bbfecbd6e9 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java index a739e5a2590d4..041d19a83f553 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java @@ -32,7 +32,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java index bab2b6ac3b48a..678ea506418ab 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java @@ -26,10 +26,10 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java index c5144e831812d..208942548afe3 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java @@ -22,10 +22,10 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java index 6fc28a17b6915..01aaf29f76453 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.awaitility.Awaitility.await; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java index fd2cc2c640307..bc8462aaa882a 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java index 7c583d3092975..be56dfc0ef21d 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java @@ -19,10 +19,10 @@ import jakarta.mail.Message; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java index 0b59144b17f16..4dc00b224c6b4 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java index 5ddcf27d26f25..7c98dc5c50a9d 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java index 9beefd987aa94..e72d76d127902 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java index 8325752f7b611..9941078af9d9c 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java index c44dd14dda4bd..2ae8af53002d3 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java @@ -27,10 +27,10 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java index ada67c408083b..27afe8f275db4 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java index f26e29c5ca001..921e796f2f0cd 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java index cd309cd68a29d..f922b77db7762 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java @@ -24,7 +24,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java index a0fcb373dbab7..d26211b2cfd39 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java index 647dfbfc60f10..ed824dce8f7c9 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java index acb048c5f7024..c5b790e9f0427 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java index b1331e6e1dcf6..0a61538c846a6 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.mail; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java index 0990cb312dace..54b28d971e78b 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java @@ -20,7 +20,7 @@ import java.util.Collection; import java.util.Properties; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java index 1fa1be17256e7..0416a2a48f189 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java index 2bfb48148592f..cb4f83adf1090 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java index 737d2e66bdb2d..e3fa9d08ba92c 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java index ad6175df28a91..748f44dda9c76 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java index c8475b5ae2e4c..c7d9684f489a1 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java index 81f862f1823f3..9fdebfa7b5fab 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java index f09d97479830a..39f9604d530be 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java index 2208caf526b39..ca638577df880 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java @@ -28,11 +28,11 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.support.ObjectHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.CastUtils; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java index 867643b68675a..74cb82f2d488b 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java index 639b1b14dbe0f..2d9d43ec59ad9 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java index 5deeb8c0aab0b..8280980d2f21a 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java index 47732f844a232..0add73b6541d3 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java index e217c3655e899..1195cdf79bbed 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class MailNameAndEmailInRecipientTest extends CamelTestSupport { diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java index cbcb0acfe4cdd..7f34787273f01 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java @@ -18,10 +18,10 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java index 6fb813558aa57..43ef532a9025f 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java index 7c343358db0cf..33c73b32c1b5d 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java index 40bbf3aaac684..8a5124a1bb0a3 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java index aca76f613e3b9..96d998f9aa686 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java index 3df28410d59a6..97ee71538fb16 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java @@ -29,10 +29,10 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java index 15652685b69f6..7e02d6b5f36d3 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java index 868a9bccb3bba..3b6fa279e63f2 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java @@ -25,10 +25,10 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; public class MailProducerUnsupportedCharsetTest extends CamelTestSupport { diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java index 9f63f904264e1..2e89bf3c67cdc 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java index 09a7accfb3dda..b580430c397a7 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java index 713fc6955b652..ae0d4fbb61e37 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java index 095b1c1581388..00c6be14b8c87 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java @@ -32,7 +32,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java index ab9a21f0fd71c..b43d70458cad8 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.mail.SearchTermBuilder.Op; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java index b3725f6fd25e4..b3b1db7d3bd12 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java index 52c931b4faba9..6adac023cda02 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java index d0aaf1475fce4..1849095441f30 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java index 3868c1ae35786..299e5a9d3b57e 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java index 697730e0a80e4..9ace5ad1069bd 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.angus.mail.imap.SortTerm; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java index 57f1098c3281e..6b104fe5b0a5b 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.angus.mail.imap.SortTerm; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java index 730d132ecfb6c..79c1dd7338824 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.angus.mail.imap.SortTerm; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java index d05d9f351ac01..cb86785276fe4 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java @@ -23,7 +23,7 @@ import jakarta.mail.MessagingException; import jakarta.mail.internet.InternetAddress; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.angus.mail.imap.SortTerm; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java index 5bbc68c11c71b..780eb897b5279 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java index 49562621fc15e..261fcec88832b 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java index 7690b1928a21e..9b33a2594641f 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java index 8558990de71a6..7762d186cc447 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java index f901a2210a3f6..f9ea4f5bf495f 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java index ddeb8c779b870..0d9a2ea22b6dc 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java index a638800031bfe..9b98109cd99d1 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java index 3bbada00f2a1e..3fa2cce9eeea2 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java @@ -40,7 +40,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java index 5e4d4f43d0eff..51d0202949395 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java index 75ee975479ca8..f5928135963f0 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java index 8c5679dd2eb19..5e1f139e7d6fe 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java index 42bfca0f2a635..1a4c8291449d9 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java @@ -33,7 +33,7 @@ import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ObjectHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.CastUtils; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java index e80a1347f5f51..fb43c5933d58f 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java @@ -33,7 +33,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java index e444bcff80a0f..a6a6fbbe671fe 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java index 4457b0f16cecf..50b948db5f0a9 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser; import org.apache.camel.component.mail.Mailbox.Protocol; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java index b012743777cd8..37eeb967c0c96 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.mail.MailTestHelper; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.jsse.SSLContextParameters; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java b/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java index f36acfed870a8..64134ce94ec55 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java @@ -35,7 +35,7 @@ import org.apache.camel.attachment.DefaultAttachment; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-mapstruct/pom.xml b/components/camel-mapstruct/pom.xml index 9a13b8f318ee2..bce0c16fc9d8c 100644 --- a/components/camel-mapstruct/pom.xml +++ b/components/camel-mapstruct/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CamelVehicleToCarTest.java b/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CamelVehicleToCarTest.java index 083853a56b5b3..a9df1c0c7d9be 100644 --- a/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CamelVehicleToCarTest.java +++ b/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CamelVehicleToCarTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mapstruct.dto.CarDto; import org.apache.camel.component.mapstruct.dto.VehicleDto; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CarToVehicleTest.java b/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CarToVehicleTest.java index f059bbd5e1a77..66882fb1e253f 100644 --- a/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CarToVehicleTest.java +++ b/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CarToVehicleTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mapstruct.dto.CarDto; import org.apache.camel.component.mapstruct.dto.VehicleDto; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/ComponentVehicleToCarTest.java b/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/ComponentVehicleToCarTest.java index 34262003206ed..d933de346648f 100644 --- a/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/ComponentVehicleToCarTest.java +++ b/components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/ComponentVehicleToCarTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mapstruct.dto.CarDto; import org.apache.camel.component.mapstruct.dto.VehicleDto; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-master/pom.xml b/components/camel-master/pom.xml index d74acaa94fd91..d6f5d653df39c 100644 --- a/components/camel-master/pom.xml +++ b/components/camel-master/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-master/src/test/java/org/apache/camel/component/master/EndpointUriEncodingTest.java b/components/camel-master/src/test/java/org/apache/camel/component/master/EndpointUriEncodingTest.java index f6ec9b9a29df3..c20a7409a15ea 100644 --- a/components/camel-master/src/test/java/org/apache/camel/component/master/EndpointUriEncodingTest.java +++ b/components/camel-master/src/test/java/org/apache/camel/component/master/EndpointUriEncodingTest.java @@ -29,7 +29,7 @@ import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.DefaultConsumer; import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; class EndpointUriEncodingTest extends CamelTestSupport { diff --git a/components/camel-mdc/pom.xml b/components/camel-mdc/pom.xml index e25e2e5f8ffc7..bec75f10b76f0 100644 --- a/components/camel-mdc/pom.xml +++ b/components/camel-mdc/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllHeadersTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllHeadersTest.java index b7f4adbbdbabb..8003d37957320 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllHeadersTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllHeadersTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllPropertiesTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllPropertiesTest.java index 0f6510a220784..4ec29a925efa7 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllPropertiesTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAllPropertiesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncTest.java index d2bafc10da561..4597c29c83aee 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncWiretapTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncWiretapTest.java index 42d7cd015d36f..d7b900eb69a5c 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncWiretapTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCAsyncWiretapTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCDefaultTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCDefaultTest.java index 234013e0a5f51..b49a1f335a21b 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCDefaultTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCDefaultTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCInterceptToEndpointBeanTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCInterceptToEndpointBeanTest.java index 489aa0ac2b29d..cf08073e96d63 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCInterceptToEndpointBeanTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCInterceptToEndpointBeanTest.java @@ -22,7 +22,7 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedHeadersTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedHeadersTest.java index 549df87f91a84..efbabc93aaf78 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedHeadersTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedHeadersTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedPropertiesTest.java b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedPropertiesTest.java index 2afa0b8fb114d..2c3b067f2f020 100644 --- a/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedPropertiesTest.java +++ b/components/camel-mdc/src/test/java/org/apache/camel/mdc/MDCSelectedPropertiesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index 03e29323a998f..9ca2290a77c94 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -77,7 +77,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -92,7 +92,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java index ca725b6d8b58e..e98af97052a3f 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java @@ -28,8 +28,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java index 3b5da90defb28..ec75969a72a65 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java @@ -25,8 +25,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java index c8e55da4d1443..91ee11461df9e 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java @@ -25,8 +25,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java index 7a5488d71bd4c..8afbecb2ce999 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java @@ -25,8 +25,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java index 49942261a35fb..b5d675ab53b93 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java index b2a9038c15c62..6630d4fc42e2c 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java @@ -25,8 +25,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java index 6c49c4ee948e2..b38efd15de8e9 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java index d9062a58ef432..01c26b9b54df2 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.metrics.MetricsComponent; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/MetricsMessageHistoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/MetricsMessageHistoryTest.java index 3861e125d41b8..5e88e782a6383 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/MetricsMessageHistoryTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/MetricsMessageHistoryTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/SpringMetricsMessageHistoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/SpringMetricsMessageHistoryTest.java index c0e6e391850c7..1a67ef1a69675 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/SpringMetricsMessageHistoryTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/SpringMetricsMessageHistoryTest.java @@ -18,7 +18,7 @@ import com.codahale.metrics.MetricRegistry; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java index 3022731b18543..f65ab3c4b788f 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.metrics.MetricsComponent; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java index 9e66f21800ad1..71d093c8c7e83 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicySubRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicySubRouteTest.java index 24a7703f2f506..e3971d5438061 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicySubRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicySubRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java index 9b7c8fd5087f5..817d43ab3b574 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-micrometer-observability/pom.xml b/components/camel-micrometer-observability/pom.xml index 0f62b96f5abaa..bc1e89b179e1f 100644 --- a/components/camel-micrometer-observability/pom.xml +++ b/components/camel-micrometer-observability/pom.xml @@ -85,7 +85,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java index 9a8eb6f5e4395..c39c09f762ec9 100644 --- a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java +++ b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java @@ -28,7 +28,7 @@ import org.apache.camel.CamelContextAware; import org.apache.camel.telemetry.Op; import org.apache.camel.telemetry.TagConstants; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; /** * This test is special as it requires a different setting to inherit the Opentelemetry propagation mechanism. diff --git a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerTestSupport.java b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerTestSupport.java index 74c509308fa35..fcf1912614203 100644 --- a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerTestSupport.java +++ b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerTestSupport.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelContextAware; import org.apache.camel.telemetry.Op; import org.apache.camel.telemetry.TagConstants; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; public class MicrometerObservabilityTracerTestSupport extends ExchangeTestSupport { diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml index 52d4502cfd5a4..18431498b3c07 100644 --- a/components/camel-micrometer/pom.xml +++ b/components/camel-micrometer/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -75,7 +75,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java index 2e332a3721dbd..9feb4a31cccb4 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java @@ -26,8 +26,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java index a8ffd130e964d..a2913405d30ae 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java @@ -27,8 +27,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java index 555d3c9610d23..1a00aea6aeb17 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class MicrometerComponentRouteTest extends CamelTestSupport { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteBackwardsCompatibleTagTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteBackwardsCompatibleTagTest.java index 91a2b4445b21b..d65e7937d9589 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteBackwardsCompatibleTagTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteBackwardsCompatibleTagTest.java @@ -28,8 +28,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java index 5450d7afab91b..ed0caf655e5b6 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java @@ -28,8 +28,8 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java index f86c02a49e126..0f961010030f4 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java @@ -25,7 +25,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.CamelJmxConfig; import org.apache.camel.component.micrometer.MicrometerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java index 140bdb2f20528..75b207a408ada 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java index 903fb5d22f0d8..ac317c9a2d33c 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java @@ -32,7 +32,7 @@ import org.apache.camel.component.micrometer.CamelJmxConfig; import org.apache.camel.component.micrometer.MicrometerConstants; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java index 07b9117deff5e..974c363d46fda 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java index b1e89e72ccefe..324deb66d320d 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java @@ -19,7 +19,7 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Timer; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java index bbe5e13ab2572..4ee86b9d45ac4 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java @@ -20,7 +20,7 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.MicrometerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/SharedMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/SharedMicrometerRoutePolicyTest.java index 536b82204de48..123389189c548 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/SharedMicrometerRoutePolicyTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/SharedMicrometerRoutePolicyTest.java @@ -25,7 +25,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.micrometer.MicrometerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-microprofile/camel-microprofile-config/pom.xml b/components/camel-microprofile/camel-microprofile-config/pom.xml index d32cfb511a9fc..d62df3b9f17c5 100644 --- a/components/camel-microprofile/camel-microprofile-config/pom.xml +++ b/components/camel-microprofile/camel-microprofile-config/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-microprofile/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java b/components/camel-microprofile/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java index 2b78548705d52..340c7951f706f 100644 --- a/components/camel-microprofile/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java +++ b/components/camel-microprofile/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.PropertiesSource; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.junit.jupiter.api.Test; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml b/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml index 3b534030a8854..a54071b3fff8a 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/pom.xml @@ -63,7 +63,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceInheritErrorHandlerTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceInheritErrorHandlerTest.java index 9e64e05c18c25..8a003b547671d 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceInheritErrorHandlerTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceInheritErrorHandlerTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class FaultToleranceInheritErrorHandlerTest extends CamelTestSupport { diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceManagementTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceManagementTest.java index cf24b7ce5fee4..771627f13026a 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceManagementTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceManagementTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationNoReflectionTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationNoReflectionTest.java index a1bf921b2910b..e7c5d202bbb12 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationNoReflectionTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationNoReflectionTest.java @@ -24,7 +24,7 @@ import org.apache.camel.spi.BeanIntrospection; import org.apache.camel.spi.CircuitBreakerConstants; import org.apache.camel.support.PluginHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java index 3578b6045afde..5a5cfbbb3e5f8 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.FaultToleranceConfigurationDefinition; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java index 20de9e21f9f9c..abb54c6001be4 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class FaultToleranceRouteBulkheadFallbackTest extends CamelTestSupport { diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadOkTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadOkTest.java index 425c12d5e776b..a235b27f15dba 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadOkTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadOkTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class FaultToleranceRouteBulkheadOkTest extends CamelTestSupport { diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackTest.java index 2beb09b7c25b3..f1e17cd6c9717 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackViaNetworkTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackViaNetworkTest.java index 95ca9f06d5515..7b34f321b0e8e 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackViaNetworkTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteFallbackViaNetworkTest.java @@ -18,10 +18,10 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteOkTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteOkTest.java index d6052736ae3cf..3657c05427ede 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteOkTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteOkTest.java @@ -23,7 +23,7 @@ import org.apache.camel.spi.BeanIntrospection; import org.apache.camel.spi.CircuitBreakerConstants; import org.apache.camel.support.PluginHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteRejectedTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteRejectedTest.java index d5b00ec45c1e6..6bb79a2516dd7 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteRejectedTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteRejectedTest.java @@ -19,10 +19,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutTest.java index 2fe00cc879d35..4402c092ad190 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutTest.java @@ -18,14 +18,14 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutThreadPoolTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutThreadPoolTest.java index 5b2ca897f367f..7e0118168b163 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutThreadPoolTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutThreadPoolTest.java @@ -21,7 +21,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.concurrent.SizedScheduledExecutorService; import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException; import org.junit.jupiter.api.Disabled; @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java index 405d29978bf50..1016f7e7b48f1 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java @@ -18,7 +18,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.java index 0ead82e36e778..3942805f07563 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.java index 95ae694e06af6..2e289b3a454a8 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-microprofile/camel-microprofile-health/pom.xml b/components/camel-microprofile/camel-microprofile-health/pom.xml index 4e421078154ef..cdfe9672a3aff 100644 --- a/components/camel-microprofile/camel-microprofile-health/pom.xml +++ b/components/camel-microprofile/camel-microprofile-health/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java index 2f236edd9c4ef..e494cbb91458c 100644 --- a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java +++ b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java @@ -35,7 +35,7 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckResultBuilder; import org.apache.camel.impl.health.AbstractHealthCheck; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.microprofile.health.HealthCheckResponse; public class CamelMicroProfileHealthTestSupport extends CamelTestSupport { diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml index cf09da4331560..38b197a8e1bca 100644 --- a/components/camel-milo/pom.xml +++ b/components/camel-milo/pom.xml @@ -71,7 +71,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java index fec1ae93d01fe..753c3521d9947 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.milo.server.MiloServerComponent; import org.apache.camel.component.mock.AssertionClause; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy; import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue; import org.opentest4j.AssertionFailedError; diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java index c6bea70873870..6b3972b24f492 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.milo.converter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue; import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java index 998e3ac180544..3651bc02ec7d1 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.milo.converter.ConverterTest; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue; import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; import org.junit.jupiter.api.Assertions; diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java index ed76bf07278d5..97bab3eacb9cd 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java @@ -18,7 +18,7 @@ import java.io.IOException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 44cf29d3f1373..c3914c5777334 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java index 84c14432248a3..5434e2fbcad55 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java @@ -27,7 +27,7 @@ import org.apache.camel.support.jsse.SecureSocketProtocolsParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; public abstract class BaseMinaTest extends CamelTestSupport { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java index 9c2a76ac3449e..21ad1eb94ea5d 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.mina; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java index 769b1e22697d9..f16b374c6d11f 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.mina; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java index a8fbedcda59d4..36a62a3c7b57f 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java index 0996fcb18c200..622acaffd8cdd 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java index 3a9f3b418513e..ab61dc87e3b6c 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java @@ -30,7 +30,7 @@ import org.apache.mina.filter.codec.ProtocolEncoderOutput; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java index 92a1cf6a6647e..b2e1c161825ab 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java @@ -22,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.isPlatform; +import static org.apache.camel.test.junit6.TestSupport.isPlatform; /** * {@link IoHandler} implementation of reverser server protocol. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java index b44facea0d88b..320be67f3bbb9 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.mina; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java index 4db98ca4f2534..06caf8d9d1b94 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.mina; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java index 97a39e92b2321..ca84d22b92350 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-minio/pom.xml b/components/camel-minio/pom.xml index 6e9d3b49e33a2..9a71fc7631907 100644 --- a/components/camel-minio/pom.xml +++ b/components/camel-minio/pom.xml @@ -81,7 +81,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java index 5ba72edd593a7..6641bb34f4759 100644 --- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java +++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java @@ -19,7 +19,7 @@ import java.util.Properties; import io.minio.MinioClient; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioTestUtils.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioTestUtils.java index f2d13fa1e8c0b..53df377416f3c 100644 --- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioTestUtils.java +++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioTestUtils.java @@ -22,7 +22,7 @@ import io.minio.ListObjectsArgs; import io.minio.MinioClient; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; public final class MinioTestUtils { diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java index cf4fd8642ae9c..048987d1e73be 100644 --- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java +++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.test.infra.minio.services.MinioService; import org.apache.camel.test.infra.minio.services.MinioServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; class MinioIntegrationTestSupport extends CamelTestSupport { diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml index 6654a509a99f3..59430827817de 100644 --- a/components/camel-mllp/pom.xml +++ b/components/camel-mllp/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java index e9401e2ded7f3..25c8f36f47cb8 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java @@ -25,14 +25,14 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceTimeoutException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java index dc80cb5bd1daf..325f14f92d22d 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpServerResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java index bea62c5fa3d27..2deb01841bf31 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.support.jsse.KeyManagersParameters; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java index c99133773e4e8..1b466a17fa63b 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java @@ -26,7 +26,7 @@ import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java index 9ee95852fa3b4..843fac809c0ba 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpServerResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java index 4d0f7b41fe081..ae8edbbb5b88a 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java @@ -27,7 +27,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java index 5289311b0c0da..3f31392bdf133 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java @@ -31,7 +31,7 @@ import org.apache.camel.support.jsse.*; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java index 5fc5e5ccfa74a..36b3c609a2d69 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java index 98d3a9ccb1c9b..f8f351517b2c1 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.apache.camel.test.mllp.PassthroughProcessor; import org.hamcrest.CoreMatchers; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java index 2285fc9f6a73a..14be89b73a4a7 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java @@ -26,7 +26,7 @@ import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java index c228575fcca9e..77fc3c884c59f 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java @@ -29,7 +29,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpServerResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java index 84e7b0ffd152a..74852c8cfa013 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java @@ -29,7 +29,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException; import org.apache.camel.test.junit.rule.mllp.MllpServerResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java index 62b6b6b416958..aa5c88ff68d23 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java @@ -26,7 +26,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java index c5d2ef36e6fc2..7e588957f8ffd 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.hamcrest.CoreMatchers.endsWith; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithoutBridgeErrorHandlerTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithoutBridgeErrorHandlerTest.java index 148a481f09816..81d950e9dc60e 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithoutBridgeErrorHandlerTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithoutBridgeErrorHandlerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.hamcrest.CoreMatchers.endsWith; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java index 234f6ae09d881..c6339dacd2225 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java @@ -28,7 +28,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java index 70f0f6b73ac0b..e4e1f8807f365 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java @@ -25,12 +25,12 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.ThrottlingExecutor.slowly; +import static org.apache.camel.test.junit6.ThrottlingExecutor.slowly; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithBridgeErrorHandlerTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithBridgeErrorHandlerTest.java index 948dd45b8a4bd..893d4bb9f6960 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithBridgeErrorHandlerTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithBridgeErrorHandlerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java index af9944fa9f040..c70ced3444a8a 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java index 378219211b9c8..2833db476fff8 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java @@ -27,7 +27,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java index 4fe49a1a9dd02..0c941baaabe95 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java @@ -26,7 +26,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.apache.camel.test.mllp.PassthroughProcessor; import org.hamcrest.CoreMatchers; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java index 46f474e99dd48..d8c60f2fff80b 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java @@ -31,7 +31,7 @@ import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java index be9db9cc26a22..6dcafd2d0c898 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java @@ -28,7 +28,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpServerResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java index 852df52125134..0aa9515eada23 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java @@ -28,7 +28,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java index f8f55d3fe1d67..5616df00e63e8 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java @@ -30,7 +30,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit.rule.mllp.MllpClientResource; import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mock/src/main/docs/mock-component.adoc b/components/camel-mock/src/main/docs/mock-component.adoc index 61ad0b1f24a4d..d48c040b912a2 100644 --- a/components/camel-mock/src/main/docs/mock-component.adoc +++ b/components/camel-mock/src/main/docs/mock-component.adoc @@ -379,7 +379,7 @@ instead. [source,java] .*`isMockEndpoints` using camel-test kit* ---- -include::{examplesdir}/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java[tags=e1] +include::{examplesdir}/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java[tags=e1] ---- @@ -443,7 +443,7 @@ The same example using the Test Kit [source,java] .*isMockEndpointsAndSkip using camel-test kit* ---- -include::{examplesdir}/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java[tags=e1] +include::{examplesdir}/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java[tags=e1] ---- === Limiting the number of messages to keep diff --git a/components/camel-mongodb-gridfs/pom.xml b/components/camel-mongodb-gridfs/pom.xml index 93ec8be559edc..29a50b9ac4b1d 100644 --- a/components/camel-mongodb-gridfs/pom.xml +++ b/components/camel-mongodb-gridfs/pom.xml @@ -83,7 +83,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/integration/AbstractMongoDbITSupport.java b/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/integration/AbstractMongoDbITSupport.java index 1855ba1029af8..77dba660cf3f4 100644 --- a/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/integration/AbstractMongoDbITSupport.java +++ b/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/integration/AbstractMongoDbITSupport.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.mongodb.services.MongoDBService; import org.apache.camel.test.infra.mongodb.services.MongoDBServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index 35f7f674dfb5e..f369b5b8d11e4 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -85,13 +85,13 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointClientTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointClientTest.java index befd5790afe18..01d25e0a5e081 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointClientTest.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointClientTest.java @@ -19,7 +19,7 @@ import com.mongodb.client.MongoClients; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointHostsTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointHostsTest.java index 35b9927755ab1..0c43fea138beb 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointHostsTest.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbEndpointHostsTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.mongodb; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbAggregateOperationIT.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbAggregateOperationIT.java index 5a81a0f5f05a6..84ff317543f7e 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbAggregateOperationIT.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbAggregateOperationIT.java @@ -29,7 +29,7 @@ import org.bson.Document; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java index 503a95037fe0c..b4c413696affd 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java @@ -34,7 +34,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.infra.mongodb.services.MongoDBService; import org.apache.camel.test.infra.mongodb.services.MongoDBServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.commons.lang3.ObjectUtils; import org.bson.Document; @@ -47,7 +47,7 @@ import static com.mongodb.client.model.Filters.eq; import static org.apache.camel.component.mongodb.MongoDbConstants.MONGO_ID; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOperationsIT.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOperationsIT.java index 2e3fbdb4839b3..29d494231edd8 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOperationsIT.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOperationsIT.java @@ -51,7 +51,7 @@ import static com.mongodb.client.model.Updates.set; import static org.apache.camel.component.mongodb.MongoDbConstants.CRITERIA; import static org.apache.camel.component.mongodb.MongoDbConstants.MONGO_ID; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOutputTypeIT.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOutputTypeIT.java index 0858021ae90ce..6a8c856924931 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOutputTypeIT.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbOutputTypeIT.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.component.mongodb.MongoDbConstants.MONGO_ID; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml index ce5cef5450add..0719c3f38ff38 100644 --- a/components/camel-mustache/pom.xml +++ b/components/camel-mustache/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java index 3df86ee4dd731..353acb8ff9138 100644 --- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java +++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java index b78a78d8048e5..b3f330ca74536 100644 --- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java +++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheRefTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheRefTest.java index b7ca9be73623b..1a5ae189029e7 100644 --- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheRefTest.java +++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheRefTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index ec46bd50e7b14..7e127b74b4bab 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java index 41a6449ae52e8..399efb8e7209c 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelFilterTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelFilterTest.java index d4aec7abafc2a..69e4b2be65219 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelFilterTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelFilterTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class MvelFilterTest extends CamelTestSupport { diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelRefTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelRefTest.java index 92e4cb9cf624c..3437570700e14 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelRefTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelRefTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java index ee0ff033f3e92..953c6fcf62450 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelScriptingLanguageTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelScriptingLanguageTest.java index 33e6aaac293b5..c54275ed0d09a 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelScriptingLanguageTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelScriptingLanguageTest.java @@ -21,7 +21,7 @@ import org.apache.camel.spi.Language; import org.apache.camel.spi.ScriptingLanguage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java index f157917bcda1b..3dae0507e374f 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.language.mvel; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml index 90f9dc6c69625..86bd55a482f0f 100644 --- a/components/camel-mybatis/pom.xml +++ b/components/camel-mybatis/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java index 0307979fd4cd4..787acfc1c9dc8 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java @@ -24,7 +24,7 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java index 19cda2e77be77..fadb75f5e7a85 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.Statement; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; public abstract class MyBatisTestSupport extends CamelTestSupport { diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java index 176451e62529e..4bb8f3c92a268 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java @@ -17,10 +17,10 @@ package org.apache.camel.component.mybatis; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanWrongMethodTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanWrongMethodTest.java index c7d8260c2622b..e3568a9080ed0 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanWrongMethodTest.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanWrongMethodTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml index 5ef6d830a8bef..60fc77b7b97c6 100644 --- a/components/camel-nats/pom.xml +++ b/components/camel-nats/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java index 91c054a4ae541..df6f5b64c2eda 100644 --- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java +++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.nats; import org.apache.camel.Consumer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthITSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthITSupport.java index 355f5b18ca125..f89c301c6571c 100644 --- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthITSupport.java +++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthITSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.component.nats.NatsComponent; import org.apache.camel.test.infra.nats.services.NatsLocalContainerAuthService; import org.apache.camel.test.infra.nats.services.NatsLocalContainerService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; public class NatsAuthITSupport extends CamelTestSupport { diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthTokenITSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthTokenITSupport.java index 554a0e04a6dfa..5e23db39653b5 100644 --- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthTokenITSupport.java +++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsAuthTokenITSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.nats.NatsComponent; import org.apache.camel.test.infra.nats.services.NatsLocalContainerAuthTokenService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; public class NatsAuthTokenITSupport extends CamelTestSupport { diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsITSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsITSupport.java index 0f72898fa8b4d..c5d2761d3095b 100644 --- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsITSupport.java +++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsITSupport.java @@ -24,7 +24,7 @@ import org.apache.camel.component.nats.NatsComponent; import org.apache.camel.test.infra.nats.services.NatsService; import org.apache.camel.test.infra.nats.services.NatsServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java index a6ff78a4dd73a..345a9b6f10192 100644 --- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java +++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsProducerReplyToTimeoutIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsTLSAuthITSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsTLSAuthITSupport.java index b20589fd791c5..dd04188e07e57 100644 --- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsTLSAuthITSupport.java +++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/integration/NatsTLSAuthITSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.component.nats.NatsComponent; import org.apache.camel.test.infra.nats.services.NatsLocalContainerService; import org.apache.camel.test.infra.nats.services.NatsLocalContainerTLSAuthService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; public class NatsTLSAuthITSupport extends CamelTestSupport { diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml index ca096228429da..6dd29fcfbbaab 100644 --- a/components/camel-netty-http/pom.xml +++ b/components/camel-netty-http/pom.xml @@ -103,7 +103,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTestSupport.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTestSupport.java index 8d23c9e5bb846..5bb756208b681 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTestSupport.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTestSupport.java @@ -23,7 +23,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.CamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.logging.log4j.core.LogEvent; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteManualTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteManualTest.java index 9eb7fb51b37f3..57f470686e1cb 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteManualTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteManualTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java index 94d774ca18f37..55348dae2639b 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorThrowExceptionOnServerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorThrowExceptionOnServerTest.java index 940658cf9c1ff..0a38eec83a9c8 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorThrowExceptionOnServerTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorThrowExceptionOnServerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java index 3381b62d8c588..332cbeaaf0955 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java index 098a1c31e265f..117e65888bfa4 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java index 5e5cd8d59ae1d..e954d35548caa 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java index 898a604dd482e..f439598635212 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.netty.http; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpConvertPayloadToInputStreamTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpConvertPayloadToInputStreamTest.java index 25e6c5d1a2888..ae4232bb95a3f 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpConvertPayloadToInputStreamTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpConvertPayloadToInputStreamTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; public class NettyHttpConvertPayloadToInputStreamTest extends BaseNettyTestSupport { diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java index a55745e853fb5..b5593109caf85 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.camel.spi.EndpointUriFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java index 8be51c3406418..30f8fe68fb4fd 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.EndpointUriFactoryTestSupport; +import org.apache.camel.test.junit6.EndpointUriFactoryTestSupport; public class NettyHttpEndpointUriFactoryTest extends EndpointUriFactoryTestSupport { diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java index 9f3b29167c00f..bb7972a955428 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpOkStatusCodeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpOkStatusCodeTest.java index 04f28de7b467b..7f776e138a5d9 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpOkStatusCodeTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpOkStatusCodeTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerConcurrentTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerConcurrentTest.java index f81d9627af8c2..bbbc3f6585502 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerConcurrentTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerConcurrentTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; @Disabled("TODO: investigate for Camel 3.0") diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java index 4b9df4b066c36..7ba15c811a1e2 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java index 6d56debcee3a0..137349c50f6fb 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java @@ -19,7 +19,7 @@ import org.apache.camel.FailedToStartRouteException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.netty.http.NettyHttpEndpoint.PROXY_NOT_SUPPORTED_MESSAGE; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectNoLocationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectNoLocationTest.java index 0d308cc09cb7e..8a561db65bfef 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectNoLocationTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectNoLocationTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java index 3b5f246dc62fe..e0c2ed0f130d1 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRequestTimeoutTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRequestTimeoutTest.java index 27b9028263c38..1ec41da9ba5bc 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRequestTimeoutTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRequestTimeoutTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java index 43db230bf4d31..f4dd0cf2593db 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.netty.NettyConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java index 4c320fa77320d..624311ae3a447 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.TestMethodOrder; import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java index 5e3fe97d77326..a13a4bb486680 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.TestMethodOrder; import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamCacheFileResponseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamCacheFileResponseTest.java index 6783e1f9e3737..a772833003e06 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamCacheFileResponseTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamCacheFileResponseTest.java @@ -25,8 +25,8 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResume503Test.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResume503Test.java index 0c66e3a9ac3fc..17e2b5fdd3fd4 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResume503Test.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResume503Test.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTransferExceptionTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTransferExceptionTest.java index 91be061ba2b07..46f871586c4f3 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTransferExceptionTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTransferExceptionTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java index 1398d5383a47f..5090547997283 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java index d17841a7b3ab8..9931c1061a1b2 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java index 84023eef77da0..c3d42ac4fd11a 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java index 6509d0e833ccb..20ce294f1e693 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceCallRouteTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceCallRouteTest.java index f26aa45002c9b..9366f1b2dd4ed 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceCallRouteTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/cloud/NettyHttpServiceCallRouteTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java index 34cc043c07a52..be8397e4e1f4e 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml index 20f4417eff9be..98ee02a60d903 100644 --- a/components/camel-netty/pom.xml +++ b/components/camel-netty/pom.xml @@ -91,7 +91,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java index 268521681ce4d..66f93461a3f66 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java @@ -24,7 +24,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.CamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.logging.log4j.core.LogEvent; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; 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 e6dd049c98090..628aa1b5c8f84 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,7 +17,7 @@ package org.apache.camel.component.netty; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java index 12c209432700b..cc95ce0e26f1a 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.netty; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java index ddcf58b3b2833..b68f146efd75f 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java @@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.PooledByteBufAllocator; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java index caa6a6acdc9f4..f60d15298bd92 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.EndpointUriFactoryTestSupport; +import org.apache.camel.test.junit6.EndpointUriFactoryTestSupport; public class NettyEndpointUriFactoryTest extends EndpointUriFactoryTestSupport { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java index 8a55d565ba0d3..c7d39a5c2bc87 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java @@ -22,12 +22,12 @@ import java.net.ServerSocket; import java.net.Socket; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; public class NettyProducerHangTest extends CamelTestSupport { 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 6aab8f8c9f6ca..cf339c8a2066f 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 @@ -35,7 +35,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueManualTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueManualTest.java index f64fa7781ded8..a41e16009bcd6 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueManualTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueManualTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java index 901ec15067144..417a2ae1d9b39 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java index 5b2dcb353ec3b..64869110e02da 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.netty; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-nitrite/pom.xml b/components/camel-nitrite/pom.xml index b91344160fdc1..a66dac68508d3 100644 --- a/components/camel-nitrite/pom.xml +++ b/components/camel-nitrite/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java index 1dbc9e823b8b0..b4e9bb72f6a6f 100644 --- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java +++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java @@ -20,8 +20,8 @@ import java.util.List; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestNameExtension; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestNameExtension; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml index a244bdfb16ae5..58baa65e33ce5 100644 --- a/components/camel-oaipmh/pom.xml +++ b/components/camel-oaipmh/pom.xml @@ -57,7 +57,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerHTTPSTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerHTTPSTest.java index 0f5bd0f4b1935..b0b88c7698df6 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerHTTPSTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerHTTPSTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerParticularCaseTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerParticularCaseTest.java index 82a00afabdda3..2eeb48dca31cb 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerParticularCaseTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerParticularCaseTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerTest.java index 54a4aa379031a..7cb134ded3a83 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentConsumerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerGetRecordTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerGetRecordTest.java index cbfd1ec2df03e..3ebf0e5c58fe1 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerGetRecordTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerGetRecordTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstLoopTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstLoopTest.java index 1def0dd1ca616..516eb6b00a181 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstLoopTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstLoopTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstTest.java index 78bac804eebda..ec55e56481c4d 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerOnlyFirstTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerTest.java index 001f2f920bba7..8f1b36235cfa9 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentProducerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentSpringTest.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentSpringTest.java index 2aa7e4349df95..40a68179abe45 100644 --- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentSpringTest.java +++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/OAIPMHComponentSpringTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.oaipmh.utils.MockOaipmhServer; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-oauth/pom.xml b/components/camel-oauth/pom.xml index d30d4febb0999..3fa48d7be1c2d 100644 --- a/components/camel-oauth/pom.xml +++ b/components/camel-oauth/pom.xml @@ -99,7 +99,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-observation/pom.xml b/components/camel-observation/pom.xml index f47064e9fb45d..c5423d7417f71 100644 --- a/components/camel-observation/pom.xml +++ b/components/camel-observation/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java index 8da596694a5ca..68340dfdfddc9 100644 --- a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java +++ b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java @@ -53,7 +53,7 @@ import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.assertj.core.api.Assertions; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/components/camel-ocsf/pom.xml b/components/camel-ocsf/pom.xml index 625839be16490..88d7dc409b244 100644 --- a/components/camel-ocsf/pom.xml +++ b/components/camel-ocsf/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfDataFormatTest.java b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfDataFormatTest.java index d5870b2d587b8..af161beb6f709 100644 --- a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfDataFormatTest.java +++ b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfDataFormatTest.java @@ -21,7 +21,7 @@ import org.apache.camel.dataformat.ocsf.model.DetectionFinding; import org.apache.camel.dataformat.ocsf.model.FindingInfo; import org.apache.camel.dataformat.ocsf.model.OcsfEvent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java index 886d0e672258b..31d60518ccc19 100644 --- a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java +++ b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java @@ -32,7 +32,7 @@ import org.apache.camel.dataformat.ocsf.model.ResourceDetails; import org.apache.camel.dataformat.ocsf.model.Tactic; import org.apache.camel.dataformat.ocsf.model.Technique; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml index 120e0045c9c79..6ff5c44510fad 100644 --- a/components/camel-ognl/pom.xml +++ b/components/camel-ognl/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java index 68b9ef1c6e87f..96f6dd6239ea2 100644 --- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java +++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java index bf27387429931..c63e87f8a5336 100644 --- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java +++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlScriptingLanguageTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlScriptingLanguageTest.java index 335c8022831de..7ad2c91be4087 100644 --- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlScriptingLanguageTest.java +++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlScriptingLanguageTest.java @@ -21,7 +21,7 @@ import org.apache.camel.spi.Language; import org.apache.camel.spi.ScriptingLanguage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java index 782f4eaf52e58..23fa14f41a1e8 100644 --- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java +++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.language.ognl; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java index 6b9e452985469..89e5cfc093875 100644 --- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java +++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class FilterTest extends CamelTestSupport { diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml index 24deb701351f0..0a0d5cc6b5b84 100644 --- a/components/camel-olingo2/camel-olingo2-api/pom.xml +++ b/components/camel-olingo2/camel-olingo2-api/pom.xml @@ -63,7 +63,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index 156b16b6be3a3..6c6e5ef971b42 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java index 154b8eb62e598..5ce179adfc7e3 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java +++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java @@ -23,8 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Assumptions; /** diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml index 04f3c258d8b92..151367172faae 100644 --- a/components/camel-olingo4/camel-olingo4-api/pom.xml +++ b/components/camel-olingo4/camel-olingo4-api/pom.xml @@ -78,7 +78,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml index 1c7c3ef3b914d..bb58be679a838 100644 --- a/components/camel-olingo4/camel-olingo4-component/pom.xml +++ b/components/camel-olingo4/camel-olingo4-component/pom.xml @@ -68,7 +68,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java index 9bd1b55f76e40..7e79d0c95427d 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java +++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.http.HttpHost; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpUriRequest; diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java index 7e79da3956968..61e601acc000a 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java +++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestMethodOrder; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java index 921584a29a127..1d6808255fc2a 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java +++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java @@ -42,8 +42,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-once/pom.xml b/components/camel-once/pom.xml index eb12789e37ebd..4cd4b6410f734 100644 --- a/components/camel-once/pom.xml +++ b/components/camel-once/pom.xml @@ -42,7 +42,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndExchangePropertyTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndExchangePropertyTest.java index 8a0fbd3b68a53..8c01a5a1a4963 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndExchangePropertyTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndExchangePropertyTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceBodyAndExchangePropertyTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderFileTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderFileTest.java index c666487a0f1c7..b69de8274be0a 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderFileTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderFileTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceBodyAndHeaderFileTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderTest.java index a2f02681dc9d6..8f9266fb90e1f 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndHeaderTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceBodyAndHeaderTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableFileTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableFileTest.java index 7f244cf122fd2..076dc3f23bfd5 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableFileTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableFileTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceBodyAndVariableFileTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableTest.java index 18eb26f7ff78e..0cb413bb8b434 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyAndVariableTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceBodyAndVariableTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyFileTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyFileTest.java index f5751c102d0bf..11f9f2ac2140a 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyFileTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceBodyFileTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceBodyFileTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceGroovyFileTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceGroovyFileTest.java index 5af24e45eaf7a..1fbbd0cd76930 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceGroovyFileTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceGroovyFileTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceGroovyFileTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleDisabledTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleDisabledTest.java index 4a41355d0527f..34e4c88b746dc 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleDisabledTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleDisabledTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceSimpleDisabledTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleFileTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleFileTest.java index 6765d899f4508..cd736ec8dd2fd 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleFileTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleFileTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceSimpleFileTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleTest.java index d0748db259e25..6d8a6d0ece3f8 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceSimpleTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceSimpleTest extends CamelTestSupport { diff --git a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceTest.java b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceTest.java index 296b18f41559a..4f6a9f1a1f3a5 100644 --- a/components/camel-once/src/test/java/org/apache/camel/component/once/OnceTest.java +++ b/components/camel-once/src/test/java/org/apache/camel/component/once/OnceTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OnceTest extends CamelTestSupport { diff --git a/components/camel-openapi-java/pom.xml b/components/camel-openapi-java/pom.xml index a8b9022d3117c..2734230899b41 100644 --- a/components/camel-openapi-java/pom.xml +++ b/components/camel-openapi-java/pom.xml @@ -110,7 +110,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java index 6fa41a0c5f614..f6b2c827dc160 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java @@ -34,7 +34,7 @@ import org.apache.camel.openapi.model.SampleComplexRequestTypeWithSchemaAnnotation; import org.apache.camel.openapi.model.SampleComplexResponseType; import org.apache.camel.openapi.model.SampleComplexResponseTypeWithSchemaAnnotation; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java index 4cd80fd47f09a..39f1b2e394e35 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java @@ -19,7 +19,7 @@ import io.swagger.v3.oas.models.OpenAPI; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java index d76c698b5d9d9..6b6845507cd76 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java index 72a8396a2726f..ca4106fb0b548 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java index dcf09a8d8d0b4..eddf1e3176e60 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java index eccede53375ef..d5bcffbf8c165 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDisabledTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDisabledTest.java index b02adf6d8dae6..857ac4162c096 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDisabledTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDisabledTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java index 29ef371069b19..6dadbc9b3cfd9 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java index fb868d909535f..e7577560b3719 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java index 49ab693a256bf..33f9eb90ba95f 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java index 6bda7819b24ab..8badf4e37c697 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java index 1eebc19571ce2..c39c37d506b2e 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java index a737eeedfbfbf..8b80043fcb6bc 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java @@ -26,7 +26,7 @@ import org.apache.camel.model.rest.RestDefinition; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.openapi.producer.DummyRestProducerFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java index 6416ab51f4588..a7ffd4ae61d16 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.model.rest.RestParamType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java index 5748e49d41f0d..2656e4fba1998 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3SecuritySchemesTest.java @@ -19,7 +19,7 @@ import io.swagger.v3.oas.models.OpenAPI; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.engine.DefaultClassResolver; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3XOfTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3XOfTest.java index 5a8a11fdde0e6..9bff2ba62622a 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3XOfTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiV3XOfTest.java @@ -24,7 +24,7 @@ import org.apache.camel.openapi.model.AllOfFormWrapper; import org.apache.camel.openapi.model.AnyOfFormWrapper; import org.apache.camel.openapi.model.OneOfFormWrapper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityPlaceholderTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityPlaceholderTest.java index c2a12f0938a2b..432ef16a019c9 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityPlaceholderTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityPlaceholderTest.java @@ -21,7 +21,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import org.apache.camel.impl.engine.DefaultClassResolver; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java index c768b74cb2480..02bd49c3c3dc4 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java @@ -18,7 +18,7 @@ import io.swagger.v3.oas.models.OpenAPI; import org.apache.camel.impl.engine.DefaultClassResolver; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java index 5dc62e37a75ea..7835cd22fd543 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class RestOpenApiGetTest extends CamelTestSupport { diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java index 4decb5f418c2d..2f875f9cb3d39 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/producer/RestOpenApiGetUriParamTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class RestOpenApiGetUriParamTest extends CamelTestSupport { diff --git a/components/camel-openapi-validator/pom.xml b/components/camel-openapi-validator/pom.xml index e6659816b7a87..03cccae79b69f 100644 --- a/components/camel-openapi-validator/pom.xml +++ b/components/camel-openapi-validator/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java index af088df8d2cd2..4dcb6be0a90a8 100644 --- a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java +++ b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java @@ -24,7 +24,7 @@ import io.swagger.v3.parser.core.models.SwaggerParseResult; import org.apache.camel.Exchange; import org.apache.camel.spi.RestClientRequestValidator; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java index cfcae76d54314..8eb51f709e78d 100644 --- a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java +++ b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientResponseValidatorTest.java @@ -23,7 +23,7 @@ import io.swagger.v3.parser.core.models.SwaggerParseResult; import org.apache.camel.Exchange; import org.apache.camel.spi.RestClientResponseValidator; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-opensearch/pom.xml b/components/camel-opensearch/pom.xml index 96a53f9eafeb9..29f60742da988 100644 --- a/components/camel-opensearch/pom.xml +++ b/components/camel-opensearch/pom.xml @@ -68,7 +68,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchBulkIT.java b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchBulkIT.java index 77540d6d86ad8..3e4888c23ecf3 100644 --- a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchBulkIT.java +++ b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchBulkIT.java @@ -38,7 +38,7 @@ import org.opensearch.client.opensearch.core.bulk.IndexOperation; import org.opensearch.client.opensearch.core.bulk.UpdateOperation; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchClusterIndexIT.java b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchClusterIndexIT.java index 7b8a91c854712..ee90d1d134e39 100644 --- a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchClusterIndexIT.java +++ b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchClusterIndexIT.java @@ -28,7 +28,7 @@ import org.opensearch.client.Request; import org.opensearch.client.opensearch.core.GetRequest; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml index a6f2e9829c24c..c45614c931055 100644 --- a/components/camel-openstack/pom.xml +++ b/components/camel-openstack/pom.xml @@ -63,7 +63,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/it/OpenstackWiremockTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/it/OpenstackWiremockTestSupport.java index c11f04700d38a..eb347e0e81294 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/it/OpenstackWiremockTestSupport.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/it/OpenstackWiremockTestSupport.java @@ -18,7 +18,7 @@ import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-opentelemetry-metrics/pom.xml b/components/camel-opentelemetry-metrics/pom.xml index b8f0540abee84..0d6700c0462f2 100644 --- a/components/camel-opentelemetry-metrics/pom.xml +++ b/components/camel-opentelemetry-metrics/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTestSupport.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTestSupport.java index c6fe0f9b25f03..0cd1b00603922 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTestSupport.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTestSupport.java @@ -25,7 +25,7 @@ import io.opentelemetry.sdk.metrics.data.LongPointData; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.data.PointData; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.ROUTE_ID_ATTRIBUTE; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/CounterRouteTest.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/CounterRouteTest.java index 035c4d0e9b410..9756532f35ce3 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/CounterRouteTest.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/CounterRouteTest.java @@ -27,7 +27,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.HEADER_COUNTER_DECREMENT; diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/DistributionSummaryRouteTest.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/DistributionSummaryRouteTest.java index 53f0961423060..2f4b86b444ef9 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/DistributionSummaryRouteTest.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/DistributionSummaryRouteTest.java @@ -25,7 +25,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.HEADER_HISTOGRAM_VALUE; diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/OpenTelemetryComponentRouteTest.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/OpenTelemetryComponentRouteTest.java index 9ab3f3ce6eba6..a19a971c684a6 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/OpenTelemetryComponentRouteTest.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/OpenTelemetryComponentRouteTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class OpenTelemetryComponentRouteTest extends CamelTestSupport { diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/TimerRouteTest.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/TimerRouteTest.java index 92538b8c4134b..35c4a6cd07ae7 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/TimerRouteTest.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/TimerRouteTest.java @@ -27,7 +27,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/CounterRouteAutoConfigIT.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/CounterRouteAutoConfigIT.java index 334d0e1047991..f27537ffc83e1 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/CounterRouteAutoConfigIT.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/CounterRouteAutoConfigIT.java @@ -34,7 +34,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.eventnotifier.OpenTelemetryExchangeEventNotifier; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/TimerRouteAutoConfigIT.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/TimerRouteAutoConfigIT.java index 31768d6ee403b..44fb9d61d376d 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/TimerRouteAutoConfigIT.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/TimerRouteAutoConfigIT.java @@ -34,7 +34,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.eventnotifier.OpenTelemetryExchangeEventNotifier; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java index a1cf31b58a2cb..970ac6c9e3da9 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java @@ -34,7 +34,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.eventnotifier.OpenTelemetryExchangeEventNotifier; import org.apache.camel.opentelemetry.metrics.integration.MemoryLogHandler; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java index 5d75849b00b6b..c42aa9384d443 100644 --- a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java +++ b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java @@ -35,7 +35,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.opentelemetry.metrics.integration.MemoryLogHandler; import org.apache.camel.opentelemetry.metrics.messagehistory.OpenTelemetryMessageHistoryFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-opentelemetry/pom.xml b/components/camel-opentelemetry/pom.xml index 646403ee50d97..686e5407d5a14 100644 --- a/components/camel-opentelemetry/pom.xml +++ b/components/camel-opentelemetry/pom.xml @@ -113,7 +113,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java index 0b92d51d0b45c..608c5effc0c80 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java @@ -38,7 +38,7 @@ import org.apache.camel.CamelContextAware; import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.spi.ThreadPoolFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryPropagateContextTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryPropagateContextTest.java index d4b215475b9b4..29ae2bd3d6058 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryPropagateContextTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryPropagateContextTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.fileUri; +import static org.apache.camel.test.junit6.TestSupport.fileUri; import static org.junit.jupiter.api.Assertions.assertTrue; public class OpenTelemetryPropagateContextTest extends CamelOpenTelemetryTestSupport { diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyPropagateContextTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyPropagateContextTest.java index 46999ca3d3271..03f70683fc65e 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyPropagateContextTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyPropagateContextTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.fileUri; +import static org.apache.camel.test.junit6.TestSupport.fileUri; import static org.junit.jupiter.api.Assertions.assertTrue; public class OpenTelemetryTracingStrategyPropagateContextTest extends CamelOpenTelemetryTestSupport { diff --git a/components/camel-opentelemetry2/pom.xml b/components/camel-opentelemetry2/pom.xml index 4a640c2ba2509..c8f5a2292864d 100644 --- a/components/camel-opentelemetry2/pom.xml +++ b/components/camel-opentelemetry2/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerTestSupport.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerTestSupport.java index 416cedb599902..7976bf8fe3619 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerTestSupport.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerTestSupport.java @@ -22,7 +22,7 @@ import io.opentelemetry.sdk.trace.data.SpanData; import org.apache.camel.telemetry.Op; import org.apache.camel.telemetry.TagConstants; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; public class OpenTelemetryTracerTestSupport extends ExchangeTestSupport { diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml index e49e4636fa3c0..009356663c31b 100644 --- a/components/camel-optaplanner/pom.xml +++ b/components/camel-optaplanner/pom.xml @@ -77,7 +77,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncConfigFileTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncConfigFileTest.java index c192362d5de1d..f586fd3939f6f 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncConfigFileTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncConfigFileTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.optaplanner.examples.cloudbalancing.domain.CloudBalance; import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator; diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerProblemChangeTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerProblemChangeTest.java index 08d5182658485..7936afab33088 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerProblemChangeTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerProblemChangeTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.optaplanner.core.api.solver.SolverFactory; diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncConfigFileTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncConfigFileTest.java index d85f45ef822da..059b150558f62 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncConfigFileTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncConfigFileTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.optaplanner; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.optaplanner.examples.cloudbalancing.domain.CloudBalance; import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator; diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerAsyncTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerAsyncTest.java index 22e6ead99470f..83893dc45ef0d 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerAsyncTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerAsyncTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.ExecutionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.optaplanner.core.api.solver.SolverFactory; diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerSyncTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerSyncTest.java index 7fbd54c9a6035..951e7fe1cc203 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerSyncTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaplannerSolverManagerSyncTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.optaplanner; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.optaplanner.core.api.solver.SolverFactory; diff --git a/components/camel-paho-mqtt5/pom.xml b/components/camel-paho-mqtt5/pom.xml index c9ccab52773a6..4ae2ab203d771 100644 --- a/components/camel-paho-mqtt5/pom.xml +++ b/components/camel-paho-mqtt5/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java index 6551db30333cb..5849361d30355 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java @@ -33,7 +33,7 @@ import org.apache.camel.test.infra.mosquitto.services.MosquittoRemoteService; import org.apache.camel.test.infra.mosquitto.services.MosquittoService; import org.apache.camel.test.infra.mosquitto.services.MosquittoServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5SendDynamicAwareTest.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5SendDynamicAwareTest.java index f39dbbcd178ad..f9fac670b1f33 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5SendDynamicAwareTest.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5SendDynamicAwareTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.spi.SendDynamicAware; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java index 2ef03c87fd1d7..6ccd2f8839ab2 100644 --- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java +++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/integration/PahoMqtt5ITSupport.java @@ -18,7 +18,7 @@ import org.apache.camel.test.infra.mosquitto.services.MosquittoService; import org.apache.camel.test.infra.mosquitto.services.MosquittoServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; public abstract class PahoMqtt5ITSupport extends CamelTestSupport { diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml index f31e114521d47..feec8b8a56766 100644 --- a/components/camel-paho/pom.xml +++ b/components/camel-paho/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-parquet-avro/pom.xml b/components/camel-parquet-avro/pom.xml index 72c139ba4b48c..65aade6c5d4f3 100644 --- a/components/camel-parquet-avro/pom.xml +++ b/components/camel-parquet-avro/pom.xml @@ -90,7 +90,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatTest.java b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatTest.java index 3c086622451fa..cdcdd01b5d074 100644 --- a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatTest.java +++ b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalFromFileTest.java b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalFromFileTest.java index d83586f7d0f99..62f6fe50f21cb 100644 --- a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalFromFileTest.java +++ b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalFromFileTest.java @@ -25,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java index d5c552f417963..b79054bf05db6 100644 --- a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java +++ b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java @@ -26,7 +26,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatWithoutUnmarshalTypeTest.java b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatWithoutUnmarshalTypeTest.java index 4c9096738157c..43495cc6ce607 100644 --- a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatWithoutUnmarshalTypeTest.java +++ b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroDataFormatWithoutUnmarshalTypeTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultUuidGenerator; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.parquet.ParquetReadOptions; import org.apache.parquet.hadoop.ParquetFileReader; import org.junit.jupiter.api.Test; diff --git a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroMarshalCompressionCodecTest.java b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroMarshalCompressionCodecTest.java index 2d969218733b7..74d41d460cc40 100644 --- a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroMarshalCompressionCodecTest.java +++ b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/ParquetAvroMarshalCompressionCodecTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultUuidGenerator; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.parquet.ParquetReadOptions; import org.apache.parquet.hadoop.ParquetFileReader; import org.apache.parquet.hadoop.metadata.CompressionCodecName; diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml index 0018854367b2b..9efd2e911d9d2 100644 --- a/components/camel-pdf/pom.xml +++ b/components/camel-pdf/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java index ded3b2950a8b4..075947a4ef9fc 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java @@ -28,7 +28,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pdfbox.Loader; import org.apache.pdfbox.io.RandomAccessReadBuffer; import org.apache.pdfbox.pdmodel.PDDocument; diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfConverterTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfConverterTest.java index c17d2427be1bb..20c986700c8b1 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfConverterTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfConverterTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.text.PDFTextStripper; import org.junit.jupiter.api.Test; diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java index 95fa04b89f08d..a3c2be8f181b8 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java @@ -26,7 +26,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pdfbox.Loader; import org.apache.pdfbox.io.RandomAccessReadBuffer; import org.apache.pdfbox.pdmodel.PDDocument; diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfMergeTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfMergeTest.java index 8a19985fba83d..13e3f8fcfd249 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfMergeTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfMergeTest.java @@ -26,7 +26,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pdfbox.Loader; import org.apache.pdfbox.io.RandomAccessReadBuffer; import org.apache.pdfbox.pdmodel.PDDocument; diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java index 545343c6d35ab..7fe5e6aacc023 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pdfbox.Loader; import org.apache.pdfbox.io.RandomAccessReadBuffer; import org.apache.pdfbox.pdmodel.PDDocument; diff --git a/components/camel-pg-replication-slot/pom.xml b/components/camel-pg-replication-slot/pom.xml index 0134af47b85e7..ba21a94b6e601 100644 --- a/components/camel-pg-replication-slot/pom.xml +++ b/components/camel-pg-replication-slot/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java index a208e4f98118d..306e70bce85b3 100644 --- a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java +++ b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java @@ -18,7 +18,7 @@ package org.apache.camel.component.pg.replication.slot.integration; import org.apache.camel.test.infra.postgres.services.PostgresLocalContainerService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.testcontainers.postgresql.PostgreSQLContainer; import org.testcontainers.utility.DockerImageName; diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml index c81030d021e29..ae64eca7f74cc 100644 --- a/components/camel-pgevent/pom.xml +++ b/components/camel-pgevent/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventITSupport.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventITSupport.java index 661c432835d3a..b33904af82fdf 100644 --- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventITSupport.java +++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventITSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.test.infra.jdbc.services.JDBCLocalContainerService; import org.apache.camel.test.infra.jdbc.services.JDBCService; import org.apache.camel.test.infra.jdbc.services.JDBCServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.testcontainers.postgresql.PostgreSQLContainer; diff --git a/components/camel-platform-http-main/pom.xml b/components/camel-platform-http-main/pom.xml index 4a7f426369a50..d2d9d9e5987a6 100644 --- a/components/camel-platform-http-main/pom.xml +++ b/components/camel-platform-http-main/pom.xml @@ -71,7 +71,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-platform-http-vertx/pom.xml b/components/camel-platform-http-vertx/pom.xml index 04134fb342c92..443668e475a13 100644 --- a/components/camel-platform-http-vertx/pom.xml +++ b/components/camel-platform-http-vertx/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpBufferConverterTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpBufferConverterTest.java index fab99599bd450..55e7487dc8fcb 100644 --- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpBufferConverterTest.java +++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpBufferConverterTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.StreamCache; import org.apache.camel.builder.ExchangeBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-platform-http/pom.xml b/components/camel-platform-http/pom.xml index bd8cb5e59e11a..22b456827bf0d 100644 --- a/components/camel-platform-http/pom.xml +++ b/components/camel-platform-http/pom.xml @@ -71,7 +71,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-plc4x/pom.xml b/components/camel-plc4x/pom.xml index 2b45deb685c7d..129ea5e3be6dd 100644 --- a/components/camel-plc4x/pom.xml +++ b/components/camel-plc4x/pom.xml @@ -136,7 +136,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTagTest.java b/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTagTest.java index 19e0b3b24069b..3785be1dcf72b 100644 --- a/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTagTest.java +++ b/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTagTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Plc4XComponentTagTest extends CamelTestSupport { diff --git a/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTest.java b/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTest.java index ec56bc95b4c15..860e0bf79d3c9 100644 --- a/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTest.java +++ b/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XComponentTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Plc4XComponentTest extends CamelTestSupport { diff --git a/components/camel-pqc/pom.xml b/components/camel-pqc/pom.xml index 564c47bae188a..f173a1f9cdc3e 100644 --- a/components/camel-pqc/pom.xml +++ b/components/camel-pqc/pom.xml @@ -48,6 +48,12 @@ ${bouncycastle-version} + + com.fasterxml.jackson.core + jackson-databind + ${jackson2-version} + + org.springframework.vault @@ -67,7 +73,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java index 5aab9f12ee046..4a30e17b54b1a 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java @@ -30,7 +30,7 @@ import org.apache.camel.component.pqc.lifecycle.KeyMetadata; import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java index 58592fceee564..2aa0b76c93dd5 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java @@ -30,7 +30,7 @@ import org.apache.camel.component.pqc.lifecycle.KeyMetadata; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpServiceFactory; import org.apache.camel.test.infra.hashicorp.vault.services.HashicorpVaultService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESNoAutowiredTest.java index 25f4501191d56..d1f5e812561d6 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java index 5476424114a17..4c8e1d1229f7c 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCBIKEGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESNoAutowiredTest.java index 546b0dbc4ca47..a2093c57a49fb 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESTest.java index e3fa66a642777..b95d43dbfa9c8 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCCMCEGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java index 2c34ab2cb51bc..f53bff06dbb4b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.pqc.lifecycle.FileBasedKeyLifecycleManager; import org.apache.camel.component.pqc.lifecycle.KeyLifecycleManager; import org.apache.camel.component.pqc.lifecycle.KeyMetadata; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESNoAutowiredTest.java index 936cbad8508c0..c5acac8dfe23b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESTest.java index eb4ac3e4a49b3..c09d689d8160a 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCFRODOGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESNoAutowiredTest.java index 835ca926f29c2..028beba7e826d 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESTest.java index 20a55f387a657..ff7f162ded908 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHQCGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESNoAutowiredTest.java index 9a3941a6f86bb..1eeaf21c5b8ca 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESTest.java index 4c9fd972c3ee7..a2f4fb4d94c63 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKYBERGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleIntegrationTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleIntegrationTest.java index a39c9e1f1bd36..43750ca4acf9f 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleIntegrationTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleIntegrationTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.pqc.lifecycle.FileBasedKeyLifecycleManager; import org.apache.camel.component.pqc.lifecycle.KeyLifecycleManager; import org.apache.camel.component.pqc.lifecycle.KeyMetadata; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESNoAutowiredTest.java index a55ac0ef3cbec..5441c43249b9b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESNoAutowiredTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java index 5df2dc7bd1737..2b4fbb3b41f5b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESAsHeaderTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESAsHeaderTest.java index 61385ae8f94ef..dbf4bb89ed439 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESAsHeaderTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESAsHeaderTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESTest.java index 4974bb8aff4ff..0e95d5de5d2d5 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAESTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAriaTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAriaTest.java index 52770b87f4c32..e38233a4487ac 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAriaTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripAriaTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST5Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST5Test.java index 91831b5666875..cdc44da68e0bf 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST5Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST5Test.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST6Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST6Test.java index 24f14f46c412e..b480205379de2 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST6Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCAST6Test.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCHACHA7539Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCHACHA7539Test.java index 22dc12493fa52..d7d3a4971a683 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCHACHA7539Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCHACHA7539Test.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCamelliaTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCamelliaTest.java index c4a9ed5ce266a..2b0c9a261db84 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCamelliaTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripCamelliaTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDESedeTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDESedeTest.java index 88cd25474fd6f..48695e116f873 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDESedeTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDESedeTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDSTU7624Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDSTU7624Test.java index 2fc9386dcf845..141f3bd597e48 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDSTU7624Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripDSTU7624Test.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGOST28147Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGOST28147Test.java index 321c139538f81..36744f8e17d81 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGOST28147Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGOST28147Test.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGRAINTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGRAINTest.java index 068507d14c334..a9ed7bffa05d0 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGRAINTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripGRAINTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC2Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC2Test.java index dd3b3c4685dc7..11cd799f29d93 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC2Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC2Test.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC5Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC5Test.java index 7b3e4960ed52c..636e989f292ef 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC5Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripRC5Test.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripSM4Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripSM4Test.java index 71dce511595a2..aab5cb5e86bb6 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripSM4Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationCryptoRoundTripSM4Test.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.crypto.CryptoDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java index b952ada3ded59..516a64dd115ae 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESNoAutowiredTest.java index efffc0a13365d..f0cd6bd502053 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESTest.java index 155928515b964..ca7384021852e 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRUGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRULPRGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRULPRGenerateEncapsulationAESTest.java index c9c78a5124bae..f54838ea3e098 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRULPRGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCNTRULPRGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESNoAutowiredTest.java index a10da24b9ae3c..7dd1a35c2915b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESTest.java index 0c3828a5b190e..bd909283dc293 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSABERGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSNTRUPrimeGenerateEncapsulationAESTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSNTRUPrimeGenerateEncapsulationAESTest.java index a88662dbd18f3..45603768762ff 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSNTRUPrimeGenerateEncapsulationAESTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSNTRUPrimeGenerateEncapsulationAESTest.java @@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.SecretKeyWithEncapsulation; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureDILITHIUMTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureDILITHIUMTest.java index 0c9f074c41298..ed2319cfd68cc 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureDILITHIUMTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureDILITHIUMTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoAutowiredTest.java index 9e8969952c9f3..c148afb1d6735 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoAutowiredTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java index eee38846ae7e0..552b889ccceaa 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconNoSignerAutowiredTest.java @@ -29,7 +29,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java index 0304b78d5b36f..856251c726bf3 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureFalconTest.java @@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java index 761cd8f5204a9..3b43240b6742b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureHSSTest.java @@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.crypto.lms.LMOtsParameters; import org.bouncycastle.pqc.crypto.lms.LMSigParameters; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSNoAutowiredTest.java index 0a907a4127be3..606f0be9bb271 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java index 715c79c401865..e47d6c9445a7c 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureLMSTest.java @@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.crypto.lms.LMOtsParameters; import org.bouncycastle.pqc.crypto.lms.LMSigParameters; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYONoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYONoAutowiredTest.java index b3629a3f012e7..5704a763f4f9d 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYONoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYONoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java index 146a033138c55..53c97ca239222 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMAYOTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.MayoParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMLDSANoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMLDSANoAutowiredTest.java index 3b596865ece3b..fef7b52992d80 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMLDSANoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureMLDSANoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java index e6923d64c3bfc..06a919ae95f5c 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureNoAutowiredSignatureTest.java @@ -29,7 +29,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.spec.MLDSAParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java index 9b87414371ae3..eaced25ce18e4 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java @@ -33,7 +33,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.cert.X509v3CertificateBuilder; import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicNoAutowiredTest.java index 3526bebf6883b..5448230d974c7 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicNoAutowiredTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java index daf5b780aa5cb..2e1dc9434d497 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignaturePicnicTest.java @@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.PicnicParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java index 026e6cd718c68..86af526c863f8 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java @@ -33,7 +33,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.cert.X509v3CertificateBuilder; import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSANoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSANoAutowiredTest.java index 65086098f60d2..9751a078c7783 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSANoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSANoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java index 34dfc209414b3..836ab092b2ffb 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSLHDSATest.java @@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.spec.SLHDSAParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVANoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVANoAutowiredTest.java index caad15e2c611f..12a033a5f1c6c 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVANoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVANoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java index d5adc6f75b9cb..31eb3a1d40b5e 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSNOVATest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.SnovaParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSNoAutowiredTest.java index 278ca24645abf..2c9bfd88ebd8c 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java index be9ba45f9e3e9..ff6d2646be661 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java index d53bad93c0e69..5af993c88c8e7 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureTest.java @@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.spec.MLDSAParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java index b05df6519a3ee..dcc04e8780165 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java @@ -33,7 +33,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.cert.X509v3CertificateBuilder; import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java index 0dc57b65743a3..d7cc20996bb66 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWrongKeyPairSignatureTest.java @@ -27,7 +27,7 @@ import org.apache.camel.*; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.spec.MLDSAParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java index 6b9763951cf73..a578f22ef6985 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSMTTest.java @@ -31,7 +31,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSNoAutowiredTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSNoAutowiredTest.java index f6e4c3b8f3c64..fad153c98ebed 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSNoAutowiredTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSNoAutowiredTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java index 6dbefb6da288d..ded7d956a8b9b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureXMSSTest.java @@ -31,7 +31,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatHeaderTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatHeaderTest.java index c0e42a5f792aa..ffc04f2b7e1c3 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatHeaderTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatHeaderTest.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatIntegrationTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatIntegrationTest.java index e6cf54ef4e3fb..5fec5c94bf194 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatIntegrationTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatIntegrationTest.java @@ -31,7 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatMultipleAlgorithmsTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatMultipleAlgorithmsTest.java index 481c4cbc2c2a0..ae85d4ceaa9bb 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatMultipleAlgorithmsTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatMultipleAlgorithmsTest.java @@ -31,7 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.KyberParameterSpec; diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatTest.java index 08ccc8d494ccb..40c28a78fbc50 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/dataformat/PQCDataFormatTest.java @@ -31,7 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jcajce.spec.MLKEMParameterSpec; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml index a6f1568021884..541c1870740aa 100644 --- a/components/camel-printer/pom.xml +++ b/components/camel-printer/pom.xml @@ -45,7 +45,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java index 78f8e2cd58fc8..3928dce00c0b3 100644 --- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java +++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java @@ -40,7 +40,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml index b9a481667ae96..12bee426748d5 100644 --- a/components/camel-protobuf/pom.xml +++ b/components/camel-protobuf/pom.xml @@ -57,7 +57,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java index 523ba599e949f..d61a40ebac724 100644 --- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java +++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java index 6a236e3c7b7c8..afbc25fe9884e 100644 --- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java +++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java index 22f3f4002a708..21687c6ca1f27 100644 --- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java +++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos; import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java index 6ba0700d3a4d8..1cec18e812d88 100644 --- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java +++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos; import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml index 0ec893b11ead0..fc06b8242017b 100644 --- a/components/camel-pubnub/pom.xml +++ b/components/camel-pubnub/pom.xml @@ -67,7 +67,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java index 1588fab944174..2d26fd0fb13d7 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.pubnub; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java index 5fbaa1346728e..4cc2cbea00eaa 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java @@ -34,7 +34,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java index 5fcda51f1f7a3..6278f23862d8b 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java @@ -25,7 +25,7 @@ import com.pubnub.internal.java.PubNubForJavaImpl; import org.apache.camel.BindToRegistry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static com.pubnub.api.enums.PNHeartbeatNotificationOptions.NONE; diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml index 7ede78ae36900..533d466c9f203 100644 --- a/components/camel-pulsar/pom.xml +++ b/components/camel-pulsar/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java index 5fbc7bc3dcf93..419737fab2ef7 100644 --- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java +++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.pulsar.utils.AutoConfiguration; import org.apache.camel.component.pulsar.utils.consumers.SubscriptionType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java index ccae4d8bc1cb5..aa7bd1dabde2c 100644 --- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java +++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java @@ -17,10 +17,10 @@ package org.apache.camel.component.pulsar; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerInAsynchronousIT.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerInAsynchronousIT.java index c48b2315cc054..234e9a6ce07f4 100644 --- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerInAsynchronousIT.java +++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerInAsynchronousIT.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class PulsarConsumerInAsynchronousIT extends PulsarITSupport { diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarITSupport.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarITSupport.java index ae2656dc5d1da..371722516b115 100644 --- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarITSupport.java +++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarITSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.test.infra.pulsar.services.PulsarService; import org.apache.camel.test.infra.pulsar.services.PulsarServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.pulsar.client.api.PulsarClient; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-python/pom.xml b/components/camel-python/pom.xml index c57276e9b0030..742c385308949 100644 --- a/components/camel-python/pom.xml +++ b/components/camel-python/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-python/src/test/java/org/apache/camel/language/python/PythonChoiceTest.java b/components/camel-python/src/test/java/org/apache/camel/language/python/PythonChoiceTest.java index 7bf7acbf0a8e2..a31b90b285b99 100644 --- a/components/camel-python/src/test/java/org/apache/camel/language/python/PythonChoiceTest.java +++ b/components/camel-python/src/test/java/org/apache/camel/language/python/PythonChoiceTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class PythonChoiceTest extends CamelTestSupport { diff --git a/components/camel-python/src/test/java/org/apache/camel/language/python/PythonScriptingLanguageTest.java b/components/camel-python/src/test/java/org/apache/camel/language/python/PythonScriptingLanguageTest.java index 140e58a1bf9b7..f6b9e6c67e0b4 100644 --- a/components/camel-python/src/test/java/org/apache/camel/language/python/PythonScriptingLanguageTest.java +++ b/components/camel-python/src/test/java/org/apache/camel/language/python/PythonScriptingLanguageTest.java @@ -21,7 +21,7 @@ import org.apache.camel.spi.Language; import org.apache.camel.spi.ScriptingLanguage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-python/src/test/java/org/apache/camel/language/python/PythonTest.java b/components/camel-python/src/test/java/org/apache/camel/language/python/PythonTest.java index 3444caf7198f0..34bfb6c70e74c 100644 --- a/components/camel-python/src/test/java/org/apache/camel/language/python/PythonTest.java +++ b/components/camel-python/src/test/java/org/apache/camel/language/python/PythonTest.java @@ -17,7 +17,7 @@ package org.apache.camel.language.python; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.LanguageTestSupport; +import org.apache.camel.test.junit6.LanguageTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml index 980beb2a280e0..5213dbfae44ef 100644 --- a/components/camel-quartz/pom.xml +++ b/components/camel-quartz/pom.xml @@ -77,7 +77,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java index a00bf7673a4de..f7056335d9bc1 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public abstract class BaseQuartzTest extends CamelTestSupport { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java index 06c2a56977316..d0c0b36875435 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java @@ -28,7 +28,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.URISupport; import org.junit.jupiter.api.Test; import org.quartz.JobDetail; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java index 3487ada7dd059..768a3fe8ed8a7 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java @@ -23,7 +23,7 @@ import org.quartz.JobDetail; import org.quartz.Trigger; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java index 383127aa72d54..d4e2fa5094bb0 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.quartz.JobDetail; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java index 0fcb3f8af9616..176b806ce2380 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java @@ -26,7 +26,7 @@ import org.quartz.Trigger; import org.quartz.TriggerKey; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java index 4622de9705543..7b796aa22e246 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Predicate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java index 7c6ab33b2de1b..9296f2d6a0752 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java index a3ad6e0dd3501..7727aa89f606a 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java index fdd647bc81ed4..5c56dcb29ce17 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.CamelContext; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java index 2765ae8e3f577..38f88cc06a6bf 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java index 9a96b785da3a3..352600762db12 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java index e3a9c0eac7d5f..07379966b771a 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java index 035648e064727..f1caf87957fe5 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java @@ -21,8 +21,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java index 16d334b0f4985..a32a57bd7d8b5 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java @@ -21,8 +21,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java index d83d3c36deb17..857bda642abe4 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java @@ -25,11 +25,11 @@ import org.apache.camel.component.quartz.QuartzComponent; import org.apache.camel.spi.Registry; import org.apache.camel.spi.RoutePolicy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.throttling.ThrottlingInflightRoutePolicy; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.executeSlowly; +import static org.apache.camel.test.junit6.TestSupport.executeSlowly; import static org.junit.jupiter.api.Assertions.assertSame; public class MultiplePoliciesOnRouteTest extends CamelTestSupport { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java index 33cdf117b4144..ee537c737ac52 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.routepolicy.quartz; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java index d976a7c9dc655..3f6ce13842fa4 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java index ecad9fba7e941..1b59a7413da84 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.direct.DirectComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.quartz.QuartzComponent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java index 1ee1c8fe2a5f2..a4024d5e2e0ca 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.routepolicy.quartz; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java index 03a7f19f84d28..6c305bded653e 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java @@ -19,12 +19,12 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.executeSlowly; +import static org.apache.camel.test.junit6.TestSupport.executeSlowly; public class SpringMultiplePoliciesOnRouteTest extends CamelSpringTestSupport { private String url = "seda:foo?concurrentConsumers=20"; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java index b701468d0c035..382dc6ff1a672 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java index ee81cb4fa0a3a..2ed70091afb31 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.routepolicy.quartz; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml index afedfec346135..29a1d205e12a8 100644 --- a/components/camel-quickfix/pom.xml +++ b/components/camel-quickfix/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java index 2f544276ff5a4..d37667d61b8ca 100644 --- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java +++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.quickfixj.converter.QuickfixjConverters; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import quickfix.Acceptor; import quickfix.DataDictionary; diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java index ef2db4188bcef..8cf7f96cdcb4f 100644 --- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java +++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java @@ -18,7 +18,7 @@ import java.util.Properties; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-reactive-executor-tomcat/pom.xml b/components/camel-reactive-executor-tomcat/pom.xml index 857f5c387514c..c6044b452126a 100644 --- a/components/camel-reactive-executor-tomcat/pom.xml +++ b/components/camel-reactive-executor-tomcat/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-reactive-executor-tomcat/src/test/java/org/apache/camel/reactive/SimpleMockTest.java b/components/camel-reactive-executor-tomcat/src/test/java/org/apache/camel/reactive/SimpleMockTest.java index b4f52ef35ebb1..ed3a263440b05 100644 --- a/components/camel-reactive-executor-tomcat/src/test/java/org/apache/camel/reactive/SimpleMockTest.java +++ b/components/camel-reactive-executor-tomcat/src/test/java/org/apache/camel/reactive/SimpleMockTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.reactive.tomcat.TomcatReactiveExecutor; import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-reactive-executor-vertx/pom.xml b/components/camel-reactive-executor-vertx/pom.xml index 4dd19efd557a5..11f6180732639 100644 --- a/components/camel-reactive-executor-vertx/pom.xml +++ b/components/camel-reactive-executor-vertx/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockLookupVertxTest.java b/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockLookupVertxTest.java index 5ad14282991a0..ac027fcc3d2a7 100644 --- a/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockLookupVertxTest.java +++ b/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockLookupVertxTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SimpleMockLookupVertxTest extends CamelTestSupport { diff --git a/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockTest.java b/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockTest.java index b9ca311a8aa66..01c78cac9d465 100644 --- a/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockTest.java +++ b/components/camel-reactive-executor-vertx/src/test/java/org/apache/camel/reactive/SimpleMockTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.reactive.vertx.VertXReactiveExecutor; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SimpleMockTest extends CamelTestSupport { diff --git a/components/camel-reactive-streams/pom.xml b/components/camel-reactive-streams/pom.xml index b2f995611187e..2b7f0326ad43f 100644 --- a/components/camel-reactive-streams/pom.xml +++ b/components/camel-reactive-streams/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BaseReactiveTest.java b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BaseReactiveTest.java index 56477a6983f77..97585a579dd4e 100644 --- a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BaseReactiveTest.java +++ b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BaseReactiveTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.impl.engine.PrototypeExchangeFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public abstract class BaseReactiveTest extends CamelTestSupport { diff --git a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BeanCallTest.java b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BeanCallTest.java index 34a4fa3ba63d8..f20acdcbfde61 100644 --- a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BeanCallTest.java +++ b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/BeanCallTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-reactor/pom.xml b/components/camel-reactor/pom.xml index bf9dd68b7a0e5..662551aad6def 100644 --- a/components/camel-reactor/pom.xml +++ b/components/camel-reactor/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTestSupport.java b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTestSupport.java index 87dbaf07acc17..f5dca9606b08f 100644 --- a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTestSupport.java +++ b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTestSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams; import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService; import org.apache.camel.impl.engine.PrototypeExchangeFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; class ReactorStreamsServiceTestSupport extends CamelTestSupport { diff --git a/components/camel-redis/pom.xml b/components/camel-redis/pom.xml index cf289ed29185e..8c0ad522c2204 100644 --- a/components/camel-redis/pom.xml +++ b/components/camel-redis/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/aggregate/integration/AggregateRedisIT.java b/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/aggregate/integration/AggregateRedisIT.java index 72728e7d519d5..bcb71f10570d9 100644 --- a/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/aggregate/integration/AggregateRedisIT.java +++ b/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/aggregate/integration/AggregateRedisIT.java @@ -21,7 +21,7 @@ import org.apache.camel.component.redis.processor.aggregate.RedisAggregationRepository; import org.apache.camel.test.infra.redis.services.RedisService; import org.apache.camel.test.infra.redis.services.RedisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-resilience4j-micrometer/pom.xml b/components/camel-resilience4j-micrometer/pom.xml index 9054981b5a2b8..f03be1ad9fe0f 100644 --- a/components/camel-resilience4j-micrometer/pom.xml +++ b/components/camel-resilience4j-micrometer/pom.xml @@ -57,7 +57,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-resilience4j-micrometer/src/test/java/org/apache/camel/component/resilience4j/micrometer/MicrometerTest.java b/components/camel-resilience4j-micrometer/src/test/java/org/apache/camel/component/resilience4j/micrometer/MicrometerTest.java index 05441474e76f8..a16009f1c7736 100644 --- a/components/camel-resilience4j-micrometer/src/test/java/org/apache/camel/component/resilience4j/micrometer/MicrometerTest.java +++ b/components/camel-resilience4j-micrometer/src/test/java/org/apache/camel/component/resilience4j/micrometer/MicrometerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-resilience4j/pom.xml b/components/camel-resilience4j/pom.xml index 68d8f9655a959..8623f55b9fffa 100644 --- a/components/camel-resilience4j/pom.xml +++ b/components/camel-resilience4j/pom.xml @@ -88,7 +88,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java index 71771be06428a..8b858f07d8177 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceIgnoreExceptionTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceIgnoreExceptionTest.java index 04c004fe8771e..17cc4645dbd31 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceIgnoreExceptionTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceIgnoreExceptionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ResilienceIgnoreExceptionTest extends CamelTestSupport { diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java index a599293b1ac8a..2b5a620587fd5 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ResilienceInheritErrorHandlerTest extends CamelTestSupport { diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java index 7f1237423de6b..66fdcdbf3012f 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResiliencePooledRouteOkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResiliencePooledRouteOkTest.java index 497e8ae649e19..71ab5086d9cb8 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResiliencePooledRouteOkTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResiliencePooledRouteOkTest.java @@ -24,7 +24,7 @@ import org.apache.camel.spi.BeanIntrospection; import org.apache.camel.spi.CircuitBreakerConstants; import org.apache.camel.support.PluginHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordExceptionTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordExceptionTest.java index c4e6046fde2bf..0d37e54bfe77b 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordExceptionTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordExceptionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ResilienceRecordExceptionTest extends CamelTestSupport { diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordIgnoreExceptionTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordIgnoreExceptionTest.java index 0b1f29d86f2a4..512de88cfcb75 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordIgnoreExceptionTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRecordIgnoreExceptionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ResilienceRecordIgnoreExceptionTest extends CamelTestSupport { diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java index a7ad21df84611..c44c3fe512e45 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ResilienceRouteBulkheadFallbackTest extends CamelTestSupport { diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java index 5c61d33ad44ba..5a3fecbffbc2c 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ResilienceRouteBulkheadOkTest extends CamelTestSupport { diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java index 1cbd96596b0d3..5ff6a06016925 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java index a8aac3e59046c..af94b119ebc17 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java @@ -18,10 +18,10 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java index a8fea263f21b3..09c7b4cee3f74 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java @@ -23,7 +23,7 @@ import org.apache.camel.spi.BeanIntrospection; import org.apache.camel.spi.CircuitBreakerConstants; import org.apache.camel.support.PluginHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java index ddcd218c625ff..e6b6d8266d886 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ExchangePropertyKey; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java index 93088b5f34490..155edff120a07 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java @@ -20,12 +20,12 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java index b86fe012799ff..7fc7d4c7fa147 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java @@ -23,12 +23,12 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java index 0ed462c95d564..f8657ec9b4817 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java @@ -18,7 +18,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java index 180331af4b736..f8fb87b6d670e 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java index c9ebfab255adb..a0ef4e2aa279a 100644 --- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java +++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CircuitBreakerConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-resourceresolver-github/pom.xml b/components/camel-resourceresolver-github/pom.xml index c3ae349e5f258..134e033603ea1 100644 --- a/components/camel-resourceresolver-github/pom.xml +++ b/components/camel-resourceresolver-github/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GistResourceResolverTest.java b/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GistResourceResolverTest.java index ca51fbab98f8f..e72a9b0c0384f 100644 --- a/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GistResourceResolverTest.java +++ b/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GistResourceResolverTest.java @@ -18,7 +18,7 @@ import org.apache.camel.spi.Resource; import org.apache.camel.support.PluginHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GitHubResourceResolverTest.java b/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GitHubResourceResolverTest.java index 82123f887b503..667f20bd2485a 100644 --- a/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GitHubResourceResolverTest.java +++ b/components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GitHubResourceResolverTest.java @@ -18,7 +18,7 @@ import org.apache.camel.spi.Resource; import org.apache.camel.support.PluginHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml index 110a7b298a9a3..c9a7402b802e0 100644 --- a/components/camel-rest-openapi/pom.xml +++ b/components/camel-rest-openapi/pom.xml @@ -108,7 +108,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java index e4a30a20dd264..158ecea5c4c8f 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiRequestValidationTest.java @@ -43,7 +43,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jackson.JacksonDataFormat; import org.apache.camel.converter.jaxb.JaxbDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-robotframework/pom.xml b/components/camel-robotframework/pom.xml index 9b8885b6466ac..ada355c83638e 100644 --- a/components/camel-robotframework/pom.xml +++ b/components/camel-robotframework/pom.xml @@ -63,7 +63,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java index e21a5adc3b244..a6fc25ab6fa84 100644 --- a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java +++ b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.robotframework; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java index ba69921b71a5b..f912813e9a5d5 100644 --- a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java +++ b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelUtilsTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java index 8239707d9cfac..249cd05902e17 100644 --- a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java +++ b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkComponentTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-rocketmq/pom.xml b/components/camel-rocketmq/pom.xml index c81aa11daff5d..3f24849894689 100644 --- a/components/camel-rocketmq/pom.xml +++ b/components/camel-rocketmq/pom.xml @@ -86,7 +86,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-rocketmq/src/test/java/org/apache/camel/component/rocketmq/RocketMQTestSupport.java b/components/camel-rocketmq/src/test/java/org/apache/camel/component/rocketmq/RocketMQTestSupport.java index c8440c46ae344..939f0870c5c71 100644 --- a/components/camel-rocketmq/src/test/java/org/apache/camel/component/rocketmq/RocketMQTestSupport.java +++ b/components/camel-rocketmq/src/test/java/org/apache/camel/component/rocketmq/RocketMQTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.test.infra.rocketmq.services.RocketMQService; import org.apache.camel.test.infra.rocketmq.services.RocketMQServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; abstract class RocketMQTestSupport extends CamelTestSupport { diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml index 41252e7a93046..8cadccb3ad14e 100644 --- a/components/camel-rss/pom.xml +++ b/components/camel-rss/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java index 452632cd72053..cd8c9a5678751 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class RssEntryPollingConsumerTest extends CamelTestSupport { diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java index 26becf4ff7718..b6d5e548cdfc2 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java index 47ae64b78901f..af23cbf2aaaea 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class RssEntrySortTest extends CamelTestSupport { diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java index 561f9b51c1e0d..f0a93c0bf670d 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class RssFilterTest extends CamelTestSupport { diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java index 911df10180eae..9ffae66e07b42 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.rss; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java index 80698a87c6179..0b88bb1ae5112 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java index 641444f841969..c22e3b104f144 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java index 70754fc611fa1..d4576bd9293f7 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java index 214700ed9c477..8812ef9cfe461 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.PollingConsumer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java index 11dc10d224d97..457ddaccb9b25 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.rss.RssUtils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class RssDataFormatTest extends CamelTestSupport { diff --git a/components/camel-rxjava/pom.xml b/components/camel-rxjava/pom.xml index ff97ebaaee42d..05b3125b63577 100644 --- a/components/camel-rxjava/pom.xml +++ b/components/camel-rxjava/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java index 39bd2d688b363..35d2d893b67b4 100644 --- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java +++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams; import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService; import org.apache.camel.impl.engine.PrototypeExchangeFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; class RxJavaStreamsServiceTestSupport extends CamelTestSupport { diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index 90fb8a3075f26..e34ca7ec8b45a 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -158,7 +158,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java index 7573f9c4a71db..bb02aa88ffc55 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.salesforce.dto.generated.Merchandise__c; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalManualIT.java index 96bae40bad8f1..b4ee912961859 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalManualIT.java @@ -25,10 +25,10 @@ import org.apache.camel.component.salesforce.api.dto.approval.ApprovalResult; import org.apache.camel.component.salesforce.api.dto.approval.Approvals; import org.apache.camel.component.salesforce.api.dto.approval.Approvals.Info; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchManualIT.java index 83b0706e22073..85ba765d72066 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchManualIT.java @@ -33,10 +33,10 @@ import org.apache.camel.component.salesforce.api.dto.composite.SObjectBatchResult; import org.apache.camel.component.salesforce.api.utils.Version; import org.apache.camel.component.salesforce.dto.generated.Account; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.BeforeEach; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsManualIT.java index 37f1ec26e8503..54d73b8d49a41 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsManualIT.java @@ -30,10 +30,10 @@ import org.apache.camel.component.salesforce.api.dto.SaveSObjectResult; import org.apache.camel.component.salesforce.api.dto.UpsertSObjectResult; import org.apache.camel.component.salesforce.dto.generated.Account; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import org.junit.jupiter.api.AfterEach; import static org.apache.camel.language.constant.ConstantLanguage.constant; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiManualIT.java index 6844769e87cb4..28874d33ac1df 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiManualIT.java @@ -35,10 +35,10 @@ import org.apache.camel.component.salesforce.api.utils.Version; import org.apache.camel.component.salesforce.dto.generated.Account; import org.apache.camel.component.salesforce.dto.generated.Line_Item__c; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeManualIT.java index 11dff8a37c11e..ce9e9844fd048 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeManualIT.java @@ -23,10 +23,10 @@ import org.apache.camel.component.salesforce.dto.generated.Account_IndustryEnum; import org.apache.camel.component.salesforce.dto.generated.Asset; import org.apache.camel.component.salesforce.dto.generated.Contact; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyManualIT.java index b687b78ca0270..5304cf682e8ed 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyManualIT.java @@ -28,10 +28,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.salesforce.api.dto.Version; import org.apache.camel.component.salesforce.api.dto.Versions; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Server; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java index 84b724d9a972f..61a769f3cf107 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java @@ -29,10 +29,10 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import org.eclipse.jetty.http.HttpHeader; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentManualIT.java index cd73dc4bd283b..9bc7336edb56c 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentManualIT.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertListSize; +import static org.apache.camel.test.junit6.TestSupport.assertListSize; @Tag("standalone") public class RecentManualIT extends AbstractSalesforceTestBase { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowManualIT.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowManualIT.java index e57e60e61e60a..f96bf398e4b65 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowManualIT.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowManualIT.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.salesforce.api.dto.Limits; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowTest.java index 8dc7e06d4d73b..a7bfe1a5c4f48 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.salesforce.api.dto.Limits; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index f27bf486885a9..a9915f909e41b 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -134,7 +134,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java index 5642ff351303c..d0f5bc7efb075 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java @@ -37,10 +37,10 @@ import org.apache.camel.component.salesforce.codegen.SchemaExecution; import org.apache.camel.component.salesforce.internal.client.RestClient; import org.apache.camel.component.salesforce.internal.client.RestClient.ResponseCallback; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-sap-netweaver/pom.xml b/components/camel-sap-netweaver/pom.xml index 5979a6ac58c83..5d0d1565cbddd 100644 --- a/components/camel-sap-netweaver/pom.xml +++ b/components/camel-sap-netweaver/pom.xml @@ -61,12 +61,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java index 0a725ed1ecc11..b3320b16bde98 100644 --- a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java +++ b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class NetWeaverFlightDataTest extends CamelTestSupport { diff --git a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java index 47d7996c03201..0dc31974844a7 100644 --- a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java +++ b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class NetWeaverFlightDataVelocityTest extends CamelTestSupport { diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml index dd3147c603f58..5b2b7a5e6a5cc 100644 --- a/components/camel-saxon/pom.xml +++ b/components/camel-saxon/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java index ceffd6f772025..fd276f58cb40c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.xquery.XQuery; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java index 5b0f4140d546c..f32e923fced9a 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java index 1d2820e5888a1..d382fc1cfbc1a 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java index 79fb53988027f..175e7425fa1ba 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java @@ -19,7 +19,7 @@ import java.io.FileInputStream; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java index 6da7cb15f93a4..7b4b6c06d6176 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java @@ -26,8 +26,8 @@ import org.apache.camel.Processor; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.StopWatch; import org.apache.camel.util.TimeUtils; import org.junit.jupiter.api.Disabled; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java index ca63226ab0f57..e85fe5231e635 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java @@ -20,7 +20,7 @@ import net.sf.saxon.xpath.XPathFactoryImpl; import org.apache.camel.language.xpath.XPathBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.ResourceLock; import org.junit.jupiter.api.parallel.Resources; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java index e99346aa1872b..d9708a9eda763 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class XQueryFilterTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java index 83bc485738e1f..ab8789a8be094 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java index 2fc310e557686..3414f3da91d3f 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java index 2ac14b902f3de..647fb6ca35c3f 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class XQueryRecipientListTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java index c4d7619c9889b..a9d7489f7a7e6 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java index cb5ec099b0c20..7602d13248fe7 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java index 93fcb9166c0a9..1514c29465296 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class XQueryTransformTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java index c85301ee65e7d..12a602fb0a187 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class XQueryTransformTextTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java index 5a9425a1862ba..75cf52ff42740 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class XQueryWithNamespacesFilterTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java index d51f8cc4f34d1..69c45abe9a4a5 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Handler; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java index 6da21e5624de1..869fdf9468524 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SoapPayloadBeanTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java index 5c907a338cfbe..3e71a53682ad9 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.xquery; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java index 842ad3963b54d..a9e6331235568 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java @@ -20,11 +20,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; /** * Concurrency test of XQuery using transform.xquery DSL. diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java index c6cebb71ef412..48d682ef32d32 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java @@ -20,7 +20,7 @@ import net.sf.saxon.Configuration; import org.apache.camel.Endpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java index 8063b1962c125..dce69aa2e40a0 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java index f5d827a0e14a7..dfc9eb11141e7 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.xquery; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java index d6558a4ccb9dc..b67cc8a33a46d 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java @@ -21,13 +21,13 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; /** * diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java index ed93f92ca00a9..be8874aaf0f99 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java @@ -22,8 +22,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java index 11feea1c29ed9..5f1d5719b610c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java @@ -21,8 +21,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java index 47c01187c4f24..faaae13fd741c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.xquery; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java index 3fbbe83177325..d153ae5ab8e2c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.language.xpath.XPathBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java index 8e6e361acb1aa..3b2d282ac87a6 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java index f9c8e33721eb5..2d9ccbe2acfdb 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java index cf9a21546cfd3..080f25cf697ac 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java @@ -20,11 +20,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import static org.apache.camel.test.junit5.TestSupport.bodyAs; +import static org.apache.camel.test.junit6.TestSupport.bodyAs; /** * Concurrency test of XQuery using classpath resources (to). diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java index f795b12a6975f..fab87595ddc9f 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.xquery; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java index b6d176d5e7dbe..5b12b5d099ee1 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java @@ -29,7 +29,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class XQueryWithExtensionTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithFlworTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithFlworTest.java index 28f67f504efd4..b799e867c0610 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithFlworTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithFlworTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.xquery; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonLanguageExtensionFunctionsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonLanguageExtensionFunctionsTest.java index d8c3032a940e0..a319c6475fc1c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonLanguageExtensionFunctionsTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonLanguageExtensionFunctionsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.xquery.XQueryWithExtensionTest; import org.apache.camel.language.xquery.XQueryLanguage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SaxonLanguageExtensionFunctionsTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java index 35787fc210189..0e449db72cbd5 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java @@ -34,7 +34,7 @@ import org.apache.camel.Exchange; import org.apache.camel.language.xpath.DefaultNamespaceContext; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.xml.StringSource; import org.junit.jupiter.api.Test; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java index 90c3b9a4fc616..ae9eb43e74e59 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java @@ -19,7 +19,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class XPathHeaderEnableSaxonJavaDslTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java index 23c37433c1d5e..912f33cf5fd36 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java @@ -17,7 +17,7 @@ package org.apache.camel.language.xpath; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java index 96a535d9222ad..ae4542aba5594 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java @@ -19,7 +19,7 @@ import javax.xml.xpath.XPathFactory; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.api.parallel.ResourceLock; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java index 38d7bf43ba86d..6f91c6b64904f 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-schematron/pom.xml b/components/camel-schematron/pom.xml index 3f58c59e2f824..0629345480bda 100644 --- a/components/camel-schematron/pom.xml +++ b/components/camel-schematron/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java index c6cbe759a17f2..e37874b5499db 100644 --- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java +++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.schematron.constant.Constants; import org.apache.camel.component.schematron.util.Utils; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java index 8749f20b96842..77a92f8f32d40 100644 --- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java +++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Producer; import org.apache.camel.component.schematron.constant.Constants; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java index 7fd54b4ca52f5..7584575bbe29b 100644 --- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java +++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java @@ -34,7 +34,7 @@ import org.apache.camel.component.schematron.processor.ClassPathURIResolver; import org.apache.camel.component.schematron.processor.TemplatesFactory; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-service/pom.xml b/components/camel-service/pom.xml index 25d4608422497..8907c82bb3e1d 100644 --- a/components/camel-service/pom.xml +++ b/components/camel-service/pom.xml @@ -45,7 +45,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-servicenow/camel-servicenow-component/pom.xml b/components/camel-servicenow/camel-servicenow-component/pom.xml index 3d74037e51f2c..707bdd661c4aa 100644 --- a/components/camel-servicenow/camel-servicenow-component/pom.xml +++ b/components/camel-servicenow/camel-servicenow-component/pom.xml @@ -99,7 +99,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowITSupport.java b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowITSupport.java index e33f2c7442b78..6bb2c86ad5352 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowITSupport.java +++ b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowITSupport.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml index 1ffa7f5e64bc7..3dde48eb6ff3e 100644 --- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml +++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml @@ -126,7 +126,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index a4c26bae15e4b..47b5fbc6a86f6 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ExposedServletEndpointURIToJMXTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ExposedServletEndpointURIToJMXTest.java index 8731114f3e0b5..656a345574763 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ExposedServletEndpointURIToJMXTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ExposedServletEndpointURIToJMXTest.java @@ -22,7 +22,7 @@ import javax.management.ObjectName; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java index 7096b81bb7c63..60d66d1d4d89f 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java @@ -37,7 +37,7 @@ import io.undertow.servlet.api.DeploymentInfo; import io.undertow.servlet.api.DeploymentManager; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java index 16cf3b6a7c1cb..272db60b701d3 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java @@ -23,7 +23,7 @@ import org.apache.camel.http.common.HttpHelper; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml index d50ad04a5d652..9db8f7073c86a 100644 --- a/components/camel-shiro/pom.xml +++ b/components/camel-shiro/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java index 75b01db5a5496..9ecf2451b6bb1 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.LockedAccountException; diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java index 06ddb3d404210..88a8c9e2a5551 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.LockedAccountException; diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java index b689749de339a..e174d45f1b8e3 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.LockedAccountException; diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java index 2566e09e3ad9c..4c0d3563aadb1 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.shiro.authz.Permission; import org.apache.shiro.authz.permission.WildcardPermission; import org.junit.jupiter.api.Test; diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java index 65430c8345279..e5781b4645e20 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ShiroRolesAuthorizationTest extends CamelTestSupport { diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml index 8d53167fcdc8a..9be1ce015238e 100644 --- a/components/camel-sjms/pom.xml +++ b/components/camel-sjms/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java index 4b12badaa8854..e80adf58bab87 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java @@ -88,7 +88,7 @@ public void testInOnlyQueueProducer() throws Exception { /** * @return - * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder() + * @see org.apache.camel.test.junit6.CamelTestSupport#createRouteBuilder() */ @Override protected RouteBuilder createRouteBuilder() { diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java index ce750fbf08e90..7ea39fce5c63e 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java @@ -18,7 +18,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java index 4b15e3c24c0d5..de143bde2f35f 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java index 35cd33737c697..45612010fa583 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java index 99896ce00e5ff..d39885c434a6d 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java index d7972d694d61a..e138610317483 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java index dbe3ea763458e..db3ebde4abb51 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsSendDynamicAwareTest.java @@ -19,8 +19,8 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.spi.SendDynamicAware; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java index 1037af2e8716c..f202fa9ad1f37 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.sjms.support.MyAsyncComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java index 9f995d2927126..9736e109178e1 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.sjms.support.MyAsyncComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java index 47684052aac61..70a191ee61ca1 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java @@ -40,7 +40,7 @@ public void testInOnlyQueueProducer() throws Exception { } /** - * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder() + * @see org.apache.camel.test.junit6.CamelTestSupport#createRouteBuilder() * * @return */ diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java index 93b54396ff6d9..e6e5fa7182533 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java @@ -40,7 +40,7 @@ public void testSynchronous() throws Exception { } /** - * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder() + * @see org.apache.camel.test.junit6.CamelTestSupport#createRouteBuilder() * * @return */ diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java index a482a08f33580..69b4ec6c78d57 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.sjms.support.JmsTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java index d22d7257f28f4..ea4e96fde15d1 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java @@ -24,7 +24,7 @@ import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; /** * Integration test that verifies the ability of SJMS to correctly process asynchronous InOut exchanges from both the diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java index 9f1c60752029c..ba51602ba7281 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java @@ -24,7 +24,7 @@ import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; /** * Integration test that verifies the ability of SJMS to correctly process asynchronous InOut exchanges from both the diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java index f36f4bb0ac444..93c9a1a713d0b 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java @@ -24,7 +24,7 @@ import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; /** * Integration test that verifies the ability of SJMS to correctly process synchronous InOut exchanges from both the diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java index b2e524451ef26..bd163df91b999 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java @@ -24,7 +24,7 @@ import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; /** * Integration test that verifies the ability of SJMS to correctly process synchronous InOut exchanges from both the diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java index fd4f5481a0935..5883a69aaf886 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.sjms.SjmsComponent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java index e08d20a8062aa..602fd3fb35005 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.sjms.support.MyAsyncComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java index f29fd88e77ed4..794221b04736f 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.sjms.support.MyAsyncComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java index f9242fb4a26d8..b20709b77ec40 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java @@ -62,7 +62,7 @@ public void testInOnlyTopicProducerProducer() throws Exception { } /** - * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder() + * @see org.apache.camel.test.junit6.CamelTestSupport#createRouteBuilder() * * @return */ diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java index bd42f6dce7b8c..f7e005dd05d6d 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java @@ -95,7 +95,7 @@ public void testInOutQueueProducerWithCorrelationId() throws Exception { } /* - * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder() + * @see org.apache.camel.test.junit6.CamelTestSupport#createRouteBuilder() * * @return * diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java index 493b479301eba..c4189d275e0e9 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.sjms.SjmsComponent; import org.apache.camel.test.infra.artemis.services.ArtemisEmbeddedServiceBuilder; import org.apache.camel.test.infra.artemis.services.ArtemisService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsCommonTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsCommonTestSupport.java index 78d5bd9e863ad..0c6088a6467dc 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsCommonTestSupport.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsCommonTestSupport.java @@ -33,14 +33,14 @@ import org.apache.camel.component.sjms.jms.DestinationCreationStrategy; import org.apache.camel.component.sjms.jms.Jms11ObjectFactory; import org.apache.camel.test.infra.artemis.services.ArtemisService; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * A support class that builds up and tears down an ActiveMQ instance to be used for unit testing. diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java index 172a22fea3756..6b05d1928ca73 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java @@ -31,7 +31,7 @@ import org.apache.camel.component.sjms.SjmsComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java index 7f5ec842dbee4..e327ddcd2f3e6 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.sjms.SjmsComponent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java index fce995d7c7cc2..0042a42fdf9d8 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedOnCompletionTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.sjms.SjmsComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java index ab37ba3be1ad3..6005e60a08c10 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueInOutProducerTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.sjms.SjmsComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java index 968ee05ed6009..e1b30734f7036 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.sjms.SjmsComponent; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml index 7b991a9854654..868b6005157b2 100644 --- a/components/camel-sjms2/pom.xml +++ b/components/camel-sjms2/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java index 3adfb61e79c4c..effe93982b474 100644 --- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java +++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java index e7c9985c5cf12..48448b95544cc 100644 --- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java +++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java index 39f537d57f9d7..d8442876aafd6 100644 --- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java +++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java index 92e81cf566d43..9be653d02c5ef 100644 --- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java +++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java index 0dd2f95c36d46..55169e550326f 100644 --- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java +++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java @@ -68,7 +68,7 @@ public void testInOnlyTopicProducerProducer() throws Exception { } /** - * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder() + * @see org.apache.camel.test.junit6.CamelTestSupport#createRouteBuilder() * * @return */ diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java index 5d5f0d6a93580..b73e481724b84 100644 --- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java +++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java @@ -31,7 +31,7 @@ import org.apache.camel.component.sjms.jms.DestinationCreationStrategy; import org.apache.camel.component.sjms2.Sjms2Component; import org.apache.camel.component.sjms2.jms.Jms2ObjectFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +64,7 @@ public void closeSessions() throws JMSException { } /* - * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext() + * @see org.apache.camel.test.junit6.CamelTestSupport#createCamelContext() * @return * @throws Exception */ diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml index 2584993b50934..96f1b94e613c9 100644 --- a/components/camel-slack/pom.xml +++ b/components/camel-slack/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java index 3a97325ea2d81..01b0d119b7015 100644 --- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java +++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java @@ -26,7 +26,7 @@ import okhttp3.Response; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java index 14780c5ad6b56..6ff6acb032485 100644 --- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java +++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.direct.DirectEndpoint; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SlackProducerTest extends CamelTestSupport { diff --git a/components/camel-smb/pom.xml b/components/camel-smb/pom.xml index 38dab65db46b9..03d14f90bf1f4 100644 --- a/components/camel-smb/pom.xml +++ b/components/camel-smb/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbToAsciiFileIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbToAsciiFileIT.java index 719b28ed1d113..f832f32d1af9f 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbToAsciiFileIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/FromSmbToAsciiFileIT.java @@ -24,7 +24,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedReadLockIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedReadLockIT.java index ee378951b65b9..0eec2b6acbc60 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedReadLockIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedReadLockIT.java @@ -35,7 +35,7 @@ import com.hierynomus.smbj.utils.SmbFiles; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedRootDirReadLockIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedRootDirReadLockIT.java index cae0ac2e2ac25..6bbb522a659de 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedRootDirReadLockIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbChangedRootDirReadLockIT.java @@ -34,7 +34,7 @@ import com.hierynomus.smbj.share.File; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java index 4a0d4bee1b3d1..5b340b0b2cbee 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java @@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.smb.services.SmbService; import org.apache.camel.test.infra.smb.services.SmbServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java index 1df64f28b1904..865231332e0ab 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.smb.services.SmbService; import org.apache.camel.test.infra.smb.services.SmbServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerLocalWorkDirectoryIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerLocalWorkDirectoryIT.java index 8cfcfb4bf195b..82fb8800f5770 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerLocalWorkDirectoryIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbConsumerLocalWorkDirectoryIT.java @@ -24,12 +24,12 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; import static org.awaitility.Awaitility.await; public class SmbConsumerLocalWorkDirectoryIT extends SmbServerTestSupport { diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerAllowNullBodyIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerAllowNullBodyIT.java index c4cbccce01eee..8f260068cbe4f 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerAllowNullBodyIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerAllowNullBodyIT.java @@ -22,7 +22,7 @@ import org.apache.camel.component.file.GenericFileOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerDoneFileNameIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerDoneFileNameIT.java index 81e720d13d510..c1c3baa3df78a 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerDoneFileNameIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerDoneFileNameIT.java @@ -23,7 +23,7 @@ import org.apache.camel.ExpressionIllegalSyntaxException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerFileExistFailIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerFileExistFailIT.java index 20110ff68ab8d..61ab53af63053 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerFileExistFailIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbProducerFileExistFailIT.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java index be8319f0cd806..b7dd44ca44caa 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java @@ -25,7 +25,7 @@ import org.apache.camel.Exchange; import org.apache.camel.test.infra.smb.services.SmbService; import org.apache.camel.test.infra.smb.services.SmbServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-smooks/pom.xml b/components/camel-smooks/pom.xml index 7daa591de6c19..ab77fde5e289b 100644 --- a/components/camel-smooks/pom.xml +++ b/components/camel-smooks/pom.xml @@ -70,7 +70,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java index fb77fccd20088..cb804bcd785d0 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksComponentTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.smooks.support.StreamUtils; import org.xmlunit.builder.DiffBuilder; diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java index 7fff65d6ead04..ea56368d5fe79 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java @@ -37,7 +37,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.stream.InputStreamCache; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.smooks.Smooks; import org.smooks.SmooksFactory; @@ -56,8 +56,8 @@ import org.xmlunit.builder.DiffBuilder; import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java index a1b246581769e..45e6962a2881c 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.smooks.Customer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.smooks.Smooks; import org.smooks.io.source.StreamSource; diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterObserverTest.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterObserverTest.java index c96b307cfb828..6d3413486116a 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterObserverTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterObserverTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.smooks.routing; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.smooks.api.bean.lifecycle.BeanContextLifecycleEvent; diff --git a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java index ccdd7996bb808..ab1f9eefc8306 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.smooks.SmooksConstants; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.smooks.Smooks; diff --git a/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java b/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java index d3b6bedf3651e..9ff9bd84487e3 100644 --- a/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java +++ b/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java @@ -27,7 +27,7 @@ import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.processor.MarshalProcessor; import org.apache.camel.support.processor.UnmarshalProcessor; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml index 890b57b4aad21..d72fbeecaecb2 100644 --- a/components/camel-smpp/pom.xml +++ b/components/camel-smpp/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentManualIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentManualIT.java index 4c683b73ef824..22304322cc544 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentManualIT.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentManualIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.smpp.SmppConstants; import org.apache.camel.component.smpp.SmppMessageType; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringManualIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringManualIT.java index fbf181a7349e2..85d4f8d886d8c 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringManualIT.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringManualIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.smpp.SmppConstants; import org.apache.camel.component.smpp.SmppMessageType; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectManualIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectManualIT.java index fc7ea3ef94062..198962c8d2d65 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectManualIT.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectManualIT.java @@ -17,7 +17,7 @@ package org.apache.camel.component.smpp.integration; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectManualIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectManualIT.java index 8e088c3b8e602..c710c2399d0b0 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectManualIT.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectManualIT.java @@ -17,7 +17,7 @@ package org.apache.camel.component.smpp.integration; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java index eeee595c7ac74..5fc529f51f8c3 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java @@ -27,7 +27,7 @@ import org.apache.camel.component.smpp.SmppConstants; import org.apache.camel.component.smpp.SmppMessageType; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jsmpp.examples.SMPPServerSimulator; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java index 74092f2f11ae5..237cce2406259 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java @@ -35,7 +35,7 @@ import org.apache.camel.spi.SupervisingRouteController; import org.apache.camel.support.SimpleEventNotifierSupport; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.jsmpp.examples.SMPPServerSimulator; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-snakeyaml/pom.xml b/components/camel-snakeyaml/pom.xml index ace45db5e425c..8bdd33d5cbd28 100644 --- a/components/camel-snakeyaml/pom.xml +++ b/components/camel-snakeyaml/pom.xml @@ -45,7 +45,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLDoSTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLDoSTest.java index 757fbabdaec91..b0460adb4eef3 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLDoSTest.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLDoSTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.java index 0becce9e7d38e..bd10152986fa3 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTest.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java index 1d594191c402e..6bb62b297051f 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.snakeyaml; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java index 603fd73ce02de..9301de41279d6 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTest.java @@ -21,11 +21,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.snakeyaml.model.TestPojo; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.params.Parameter; -import org.apache.camel.test.junit5.params.Parameterized; -import org.apache.camel.test.junit5.params.Parameters; -import org.apache.camel.test.junit5.params.Test; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.params.Parameter; +import org.apache.camel.test.junit6.params.Parameterized; +import org.apache.camel.test.junit6.params.Parameters; +import org.apache.camel.test.junit6.params.Test; import static org.apache.camel.component.snakeyaml.SnakeYAMLTestHelper.createDataFormat; import static org.apache.camel.component.snakeyaml.SnakeYAMLTestHelper.createPrettyFlowDataFormat; diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java index 60e2d0c32dd80..404fc8abf0fe9 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.snakeyaml.model.TestPojo; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SnakeYAMLTypeFilterTest extends CamelTestSupport { diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLUnmarshalTypeTest.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLUnmarshalTypeTest.java index 78cba9f6c9028..f9cdd30fe1b24 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLUnmarshalTypeTest.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLUnmarshalTypeTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.snakeyaml.model.TestPojo; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml index e9ea1b1cc9381..5feb72dfdb392 100644 --- a/components/camel-snmp/pom.xml +++ b/components/camel-snmp/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 true test diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/SnmpTestSupport.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/SnmpTestSupport.java index 390eeb30d97e4..7eb425ff8800d 100644 --- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/SnmpTestSupport.java +++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/SnmpTestSupport.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class SnmpTestSupport extends CamelTestSupport { diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml index fa00f15a91223..aedb7fe74c53e 100644 --- a/components/camel-soap/pom.xml +++ b/components/camel-soap/pom.xml @@ -76,12 +76,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java index 075b139f65956..03edfea9cca95 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.dataformat.soap.name.ElementNameStrategy; import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java index 10557f42c0782..1fdcc891ea14b 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java @@ -31,7 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.dataformat.soap.name.ElementNameStrategy; import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java index de1673ce9db3c..9c0fe57941c0c 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.dataformat.soap.name.ElementNameStrategy; import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java index 0ce066fc4d2df..b9e4b911177be 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.soap.name.ElementNameStrategy; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SoapMarshalTest extends CamelTestSupport { diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java index d5e8c648bd7b8..9336eb2a6729e 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.soap.name.ElementNameStrategy; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java index d6ddbe73f6c06..5e3b62f87e42a 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.dataformat.soap.name.ElementNameStrategy; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java index 1a7b55dd3a661..7d5fd5f205d62 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java index 3523b71ddbdc0..3b53f5e25502d 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java index cded0872c8d0b..0c84a8be4fa70 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java index 65249fb24c636..5c6750ba122f3 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java index 132e332b89fb5..56123d74cf093 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java @@ -28,7 +28,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java index 53f8478771b97..e93f55971932b 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java @@ -32,7 +32,7 @@ import org.apache.camel.dataformat.soap.TestUtil; import org.apache.camel.dataformat.soap.name.ElementNameStrategy; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class Soap12MarshalTest extends CamelTestSupport { diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java index f3a6a61c25674..81a9452c2c773 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java index d1fb2784104d7..235a023e8d484 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java @@ -28,7 +28,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml index 0d958f2f5c482..586ab798232e8 100644 --- a/components/camel-solr/pom.xml +++ b/components/camel-solr/pom.xml @@ -68,7 +68,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java index 928f423135cc7..0d152d465a9fe 100644 --- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java +++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ResolveEndpointFailedException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.impl.HttpJdkSolrClient; import org.junit.jupiter.api.Test; diff --git a/components/camel-solr/src/test/resources/log4j2.properties b/components/camel-solr/src/test/resources/log4j2.properties index 0e64154a89b80..49ed19f38eba2 100644 --- a/components/camel-solr/src/test/resources/log4j2.properties +++ b/components/camel-solr/src/test/resources/log4j2.properties @@ -32,5 +32,5 @@ rootLogger.appenderRef.stdout.ref = stdout logger.solr-test-infra-container.name = container.solr logger.solr-test-infra-container.level = INFO -logger.solr-camel-test.name = org.apache.camel.test.junit5 +logger.solr-camel-test.name = org.apache.camel.test.junit6 logger.solr-camel-test.level = INFO diff --git a/components/camel-splunk-hec/pom.xml b/components/camel-splunk-hec/pom.xml index a0789d57aeb8d..181d052884abc 100644 --- a/components/camel-splunk-hec/pom.xml +++ b/components/camel-splunk-hec/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECITManualTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECITManualTest.java index bfedf67789999..3f26688801cb0 100644 --- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECITManualTest.java +++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECITManualTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.splunkhec.SplunkHECProducer; import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.DefaultMessage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml index ee5480b86e260..35d83dad6d6be 100644 --- a/components/camel-splunk/pom.xml +++ b/components/camel-splunk/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java index e49a029ce949a..c268c0982fe41 100644 --- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java +++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java @@ -40,7 +40,7 @@ import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.isA; diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java index bea493eb0a54e..fdb6874207726 100644 --- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java +++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java @@ -18,7 +18,7 @@ import com.splunk.SSLSecurityProtocol; import com.splunk.Service; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java index e83eaaf3c1be0..9079bfdd2f0bc 100644 --- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java +++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java @@ -20,7 +20,7 @@ import com.splunk.Service; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java index 00380818b7151..f65bea3afc345 100644 --- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java +++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.splunk.integration; import org.apache.camel.component.splunk.event.SplunkEvent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; public abstract class SplunkTest extends CamelTestSupport { diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml index 91167fd6214a3..bd6b6c03f585f 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/pom.xml @@ -78,12 +78,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/OllamaTestSupport.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/OllamaTestSupport.java index a6e5bdf6ef468..6a8ad9a1fcbd7 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/OllamaTestSupport.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/OllamaTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.ai.chat.model.ChatModel; import org.springframework.ai.ollama.OllamaChatModel; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java index 78dccedc4d982..81769a8c3e4ce 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.springai.chat; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.ai.chat.messages.AssistantMessage; import org.springframework.ai.chat.model.ChatModel; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsDiscoveryTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsDiscoveryTest.java index 30427e0bcbe45..298529b1eaf3f 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsDiscoveryTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsDiscoveryTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.springai.tools.spec.CamelToolExecutorCache; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml index 172a044907d70..06794216f7a7c 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/OllamaTestSupport.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/OllamaTestSupport.java index 3cbe64adedb9f..a33509645c93f 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/OllamaTestSupport.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/OllamaTestSupport.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.infra.ollama.services.OllamaService; import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.ai.embedding.EmbeddingModel; import org.springframework.ai.ollama.OllamaEmbeddingModel; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/SpringAiEmbeddingsComponentTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/SpringAiEmbeddingsComponentTest.java index 627555d5136e9..3fe09376371de 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/SpringAiEmbeddingsComponentTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-embeddings/src/test/java/org/apache/camel/component/springai/embeddings/SpringAiEmbeddingsComponentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Message; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.Embedding; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/pom.xml b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/pom.xml index 1af0b3dbd6716..8b3880a244f5c 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/pom.xml +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -60,7 +60,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/JsonSchemaTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/JsonSchemaTest.java index 791e3b4aa5c2c..c9b961fa6d0a3 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/JsonSchemaTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/JsonSchemaTest.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.Consumer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/SpringAiToolsComponentTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/SpringAiToolsComponentTest.java index 8b788cd8fa0d5..62e9b9f136cfb 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/SpringAiToolsComponentTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/test/java/org/apache/camel/component/springai/tools/SpringAiToolsComponentTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.springai.tools; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml index 97da956a1ebcb..5007cae51d9bb 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/QdrantVectorStoreIT.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/QdrantVectorStoreIT.java index faa101e9eb720..194b3bfdea119 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/QdrantVectorStoreIT.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/QdrantVectorStoreIT.java @@ -28,7 +28,7 @@ import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory; import org.apache.camel.test.infra.qdrant.services.QdrantService; import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java index 905621d0f7c0d..b65256079b696 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.ai.document.Document; diff --git a/components/camel-spring-parent/camel-spring-batch/pom.xml b/components/camel-spring-parent/camel-spring-batch/pom.xml index cb9aec6d22435..22ffd91bc5945 100644 --- a/components/camel-spring-parent/camel-spring-batch/pom.xml +++ b/components/camel-spring-parent/camel-spring-batch/pom.xml @@ -59,12 +59,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java index 34f54554fc4ce..cd1cf68ed73ed 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java +++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java @@ -27,8 +27,8 @@ import org.apache.camel.spi.UriPath; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.DefaultEndpoint; -import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobRegistry; +import org.springframework.batch.core.job.Job; import org.springframework.batch.core.launch.JobLauncher; /** diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java index 1598269accd53..b7a98a73924ef 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java +++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java @@ -25,11 +25,11 @@ import org.apache.camel.support.DefaultProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.configuration.JobRegistry; +import org.springframework.batch.core.job.Job; +import org.springframework.batch.core.job.JobExecution; +import org.springframework.batch.core.job.parameters.JobParameters; +import org.springframework.batch.core.job.parameters.JobParametersBuilder; import org.springframework.batch.core.launch.JobLauncher; /** diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java index 994f8ff07c3e9..59f9ec0a9477b 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java +++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java @@ -19,7 +19,7 @@ import org.apache.camel.ProducerTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.item.ItemProcessor; +import org.springframework.batch.infrastructure.item.ItemProcessor; /** * Spring Batch {@link ItemProcessor} sending synchronous request to the given Camel endpoint. The actual processing of diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java index 85bfb7cb892a7..2ea431bc1a67e 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java +++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java @@ -22,7 +22,7 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.item.ItemReader; +import org.springframework.batch.infrastructure.item.ItemReader; import org.springframework.beans.factory.InitializingBean; public class CamelItemReader extends ServiceSupport implements ItemReader, InitializingBean { diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java index 13e675b5268f0..bd1b4c69c44fe 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java +++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java @@ -19,8 +19,8 @@ import org.apache.camel.ProducerTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.item.Chunk; -import org.springframework.batch.item.ItemWriter; +import org.springframework.batch.infrastructure.item.Chunk; +import org.springframework.batch.infrastructure.item.ItemWriter; public class CamelItemWriter implements ItemWriter { diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java index a0440819c16b7..f33b89283b939 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java +++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java @@ -19,8 +19,8 @@ import org.apache.camel.ProducerTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobExecutionListener; +import org.springframework.batch.core.job.JobExecution; +import org.springframework.batch.core.listener.JobExecutionListener; public class CamelJobExecutionListener implements JobExecutionListener { 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 443c2310de593..fb643ac28b898 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 @@ -25,16 +25,16 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobRegistry; +import org.springframework.batch.core.job.Job; import org.springframework.batch.core.launch.JobLauncher; -import static org.apache.camel.test.junit5.TestSupport.header; +import static org.apache.camel.test.junit6.TestSupport.header; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; 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 7b14d5b61d96d..4a3f40538f826 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 @@ -26,17 +26,17 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.configuration.JobRegistry; +import org.springframework.batch.core.job.Job; +import org.springframework.batch.core.job.JobExecution; +import org.springframework.batch.core.job.parameters.JobParameters; import org.springframework.batch.core.launch.JobLauncher; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIT.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIT.java index 6670eea71b253..ed1f8ce0962a4 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIT.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIT.java @@ -18,7 +18,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherIT.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherIT.java index d7a9a3687b9dc..416767e553479 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherIT.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherIT.java @@ -18,7 +18,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java index 388731d34c7c6..164e21a669828 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java @@ -18,7 +18,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; 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 5fb9262f7479c..070bf3d17781c 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 @@ -16,7 +16,7 @@ */ package org.apache.camel.component.spring.batch.support; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java index f3cb260e9ad5a..720e148fd5c14 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java @@ -16,9 +16,9 @@ */ package org.apache.camel.component.spring.batch.support; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import org.springframework.batch.item.Chunk; +import org.springframework.batch.infrastructure.item.Chunk; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java index 829f367972707..c9fd13872a20d 100644 --- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java +++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java @@ -17,12 +17,12 @@ package org.apache.camel.component.spring.batch.support; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.job.JobExecution; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-spring-parent/camel-spring-cloud-config/pom.xml b/components/camel-spring-parent/camel-spring-cloud-config/pom.xml index db2d13d40e791..04112c52d18ef 100644 --- a/components/camel-spring-parent/camel-spring-cloud-config/pom.xml +++ b/components/camel-spring-parent/camel-spring-cloud-config/pom.xml @@ -70,12 +70,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-cloud-config/src/main/java/org/apache/camel/component/spring/cloud/config/SpringConfigProvider.java b/components/camel-spring-parent/camel-spring-cloud-config/src/main/java/org/apache/camel/component/spring/cloud/config/SpringConfigProvider.java index a54904a51f8a9..4cc8191bb0c80 100644 --- a/components/camel-spring-parent/camel-spring-cloud-config/src/main/java/org/apache/camel/component/spring/cloud/config/SpringConfigProvider.java +++ b/components/camel-spring-parent/camel-spring-cloud-config/src/main/java/org/apache/camel/component/spring/cloud/config/SpringConfigProvider.java @@ -19,9 +19,9 @@ import org.apache.camel.CamelContext; import org.apache.camel.vault.SpringCloudConfigConfiguration; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.ConfigurableBootstrapContext; -import org.springframework.boot.DefaultBootstrapContext; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; +import org.springframework.boot.bootstrap.DefaultBootstrapContext; import org.springframework.boot.context.config.ConfigData; import org.springframework.boot.context.config.ConfigDataLoaderContext; import org.springframework.boot.logging.DeferredLogs; diff --git a/components/camel-spring-parent/camel-spring-jdbc/pom.xml b/components/camel-spring-parent/camel-spring-jdbc/pom.xml index bbfe931abf75b..4285f8877e6af 100644 --- a/components/camel-spring-parent/camel-spring-jdbc/pom.xml +++ b/components/camel-spring-parent/camel-spring-jdbc/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/AbstractJdbcTestSupport.java b/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/AbstractJdbcTestSupport.java index 2c05c2ed1ea4c..948f138bcfe0e 100644 --- a/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/AbstractJdbcTestSupport.java +++ b/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/AbstractJdbcTestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.component.spring.jdbc; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; diff --git a/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/JdbcSpringAnotherRouteTest.java b/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/JdbcSpringAnotherRouteTest.java index cbdfe6ce1bfb2..3653fc8d095b7 100644 --- a/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/JdbcSpringAnotherRouteTest.java +++ b/components/camel-spring-parent/camel-spring-jdbc/src/test/java/org/apache/camel/component/spring/jdbc/JdbcSpringAnotherRouteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-ldap/pom.xml b/components/camel-spring-parent/camel-spring-ldap/pom.xml index 8c74911932012..a94c1c1ecbcbe 100644 --- a/components/camel-spring-parent/camel-spring-ldap/pom.xml +++ b/components/camel-spring-parent/camel-spring-ldap/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java b/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java index ad40d093dbd48..1b6f6da403e6b 100644 --- a/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java +++ b/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java @@ -28,7 +28,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; diff --git a/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java b/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java index b23662a924754..cf70bd27ab064 100644 --- a/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java +++ b/components/camel-spring-parent/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java @@ -30,7 +30,7 @@ import org.apache.camel.Message; import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.DefaultMessage; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mock; diff --git a/components/camel-spring-parent/camel-spring-main/pom.xml b/components/camel-spring-parent/camel-spring-main/pom.xml index c1085c50689b2..ab5a54713090d 100644 --- a/components/camel-spring-parent/camel-spring-main/pom.xml +++ b/components/camel-spring-parent/camel-spring-main/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java b/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java index d6768ab6679d3..f0969bdc83bce 100644 --- a/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java +++ b/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/MisspelledRouteRefTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RuntimeCamelException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java b/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java index 8a5b7e720696c..85d2b062ec9ca 100644 --- a/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java +++ b/components/camel-spring-parent/camel-spring-main/src/test/java/org/apache/camel/spring/SpringMainStartFailedIssueTest.java @@ -17,10 +17,10 @@ package org.apache.camel.spring; import org.apache.camel.FailedToCreateRouteException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.*; public class SpringMainStartFailedIssueTest extends CamelTestSupport { diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml b/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml index 2407191f5786c..4cdc252af0366 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml +++ b/components/camel-spring-parent/camel-spring-rabbitmq/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponentConfigurer.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponentConfigurer.java index 79d264124ec77..782e28245b809 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponentConfigurer.java +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponentConfigurer.java @@ -76,7 +76,7 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj case "rejectAndDontRequeue": target.setRejectAndDontRequeue(property(camelContext, boolean.class, value)); return true; case "replytimeout": case "replyTimeout": target.setReplyTimeout(property(camelContext, java.time.Duration.class, value).toMillis()); return true; - case "retry": target.setRetry(property(camelContext, org.springframework.retry.interceptor.RetryOperationsInterceptor.class, value)); return true; + case "retry": target.setRetry(property(camelContext, org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor.class, value)); return true; case "retrydelay": case "retryDelay": target.setRetryDelay(property(camelContext, int.class, value)); return true; case "shutdowntimeout": @@ -148,7 +148,7 @@ public Class getOptionType(String name, boolean ignoreCase) { case "rejectAndDontRequeue": return boolean.class; case "replytimeout": case "replyTimeout": return long.class; - case "retry": return org.springframework.retry.interceptor.RetryOperationsInterceptor.class; + case "retry": return org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor.class; case "retrydelay": case "retryDelay": return int.class; case "shutdowntimeout": diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpointConfigurer.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpointConfigurer.java index b3e860738c8a9..61ba0d4a09ef2 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpointConfigurer.java +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpointConfigurer.java @@ -83,7 +83,7 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj case "rejectAndDontRequeue": target.setRejectAndDontRequeue(property(camelContext, boolean.class, value)); return true; case "replytimeout": case "replyTimeout": target.setReplyTimeout(property(camelContext, java.time.Duration.class, value).toMillis()); return true; - case "retry": target.setRetry(property(camelContext, org.springframework.retry.interceptor.RetryOperationsInterceptor.class, value)); return true; + case "retry": target.setRetry(property(camelContext, org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor.class, value)); return true; case "retrydelay": case "retryDelay": target.setRetryDelay(property(camelContext, int.class, value)); return true; case "routingkey": @@ -166,7 +166,7 @@ public Class getOptionType(String name, boolean ignoreCase) { case "rejectAndDontRequeue": return boolean.class; case "replytimeout": case "replyTimeout": return long.class; - case "retry": return org.springframework.retry.interceptor.RetryOperationsInterceptor.class; + case "retry": return org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor.class; case "retrydelay": case "retryDelay": return int.class; case "routingkey": diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/resources/META-INF/org/apache/camel/component/springrabbit/spring-rabbitmq.json b/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/resources/META-INF/org/apache/camel/component/springrabbit/spring-rabbitmq.json index aa4bc0c7e89a7..1cdc41b2657a1 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/resources/META-INF/org/apache/camel/component/springrabbit/spring-rabbitmq.json +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/generated/resources/META-INF/org/apache/camel/component/springrabbit/spring-rabbitmq.json @@ -43,7 +43,7 @@ "maxConcurrentConsumers": { "index": 16, "kind": "property", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, "messageListenerContainerType": { "index": 17, "kind": "property", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "index": 18, "kind": "property", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 250, "description": "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput." }, - "retry": { "index": 19, "kind": "property", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, + "retry": { "index": 19, "kind": "property", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, "shutdownTimeout": { "index": 20, "kind": "property", "displayName": "Shutdown Timeout", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout." }, "allowNullBody": { "index": 21, "kind": "property", "displayName": "Allow Null Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown." }, "autoDeclareProducer": { "index": 22, "kind": "property", "displayName": "Auto Declare Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether the producer should auto declare binding between exchange, queue and routing key when starting. Enabling this can be good for development to make it easy to standup exchanges, queues and bindings on the broker." }, @@ -106,7 +106,7 @@ "maxConcurrentConsumers": { "index": 24, "kind": "parameter", "displayName": "Max Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "The maximum number of consumers (available only with SMLC)" }, "messageListenerContainerType": { "index": 25, "kind": "parameter", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" }, "prefetchCount": { "index": 26, "kind": "parameter", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput." }, - "retry": { "index": 27, "kind": "parameter", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, + "retry": { "index": 27, "kind": "parameter", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." }, "allowNullBody": { "index": 28, "kind": "parameter", "displayName": "Allow Null Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown." }, "autoDeclareProducer": { "index": 29, "kind": "parameter", "displayName": "Auto Declare Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether the producer should auto declare binding between exchange, queue and routing key when starting." }, "confirm": { "index": 30, "kind": "parameter", "displayName": "Confirm", "group": "producer", "label": "producer", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "auto", "description": "Controls whether to wait for confirms. The connection factory must be configured for publisher confirms and this method. auto = Camel detects if the connection factory uses confirms or not. disabled = Confirms is disabled. enabled = Confirms is enabled." }, diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java index ee92c6e03c1c3..f265117b727a7 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java @@ -21,9 +21,6 @@ import org.springframework.amqp.rabbit.core.RabbitAdmin; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; import org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer; -import org.springframework.retry.backoff.FixedBackOffPolicy; -import org.springframework.retry.policy.NeverRetryPolicy; -import org.springframework.retry.policy.SimpleRetryPolicy; import static org.apache.camel.component.springrabbit.SpringRabbitMQConstants.*; @@ -72,14 +69,12 @@ public AbstractMessageListenerContainer createListenerContainer(SpringRabbitMQEn } else { RetryInterceptorBuilder builder = RetryInterceptorBuilder.stateless(); if (endpoint.getMaximumRetryAttempts() <= 0) { - builder.retryPolicy(new NeverRetryPolicy()); + builder.maxRetries(0); } else if (endpoint.getMaximumRetryAttempts() > 0) { - builder.retryPolicy(new SimpleRetryPolicy(endpoint.getMaximumRetryAttempts())); + builder.maxRetries(endpoint.getMaximumRetryAttempts()); } if (endpoint.getRetryDelay() > 0) { - FixedBackOffPolicy delay = new FixedBackOffPolicy(); - delay.setBackOffPeriod(endpoint.getRetryDelay()); - builder.backOffPolicy(delay); + builder.backOffOptions(endpoint.getRetryDelay(), 1, endpoint.getRetryDelay()); } if (endpoint.isRejectAndDontRequeue()) { builder.recoverer(new RejectAndDontRequeueRecoverer()); diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java index 9610ef00e6ed4..14304e0996855 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java @@ -25,9 +25,9 @@ import org.apache.camel.support.HeaderFilterStrategyComponent; import org.apache.camel.util.PropertiesHelper; import org.springframework.amqp.core.AmqpAdmin; +import org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.support.converter.MessageConverter; -import org.springframework.retry.interceptor.RetryOperationsInterceptor; import org.springframework.util.ErrorHandler; import static org.apache.camel.component.springrabbit.SpringRabbitMQConstants.DIRECT_MESSAGE_LISTENER_CONTAINER; @@ -104,7 +104,7 @@ public class SpringRabbitMQComponent extends HeaderFilterStrategyComponent { private Integer maxConcurrentConsumers; @Metadata(label = "consumer,advanced", description = "Custom retry configuration to use. " + "If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.") - private RetryOperationsInterceptor retry; + private StatelessRetryOperationsInterceptor retry; @Metadata(label = "consumer", defaultValue = "5", description = "How many times a Rabbitmq consumer will retry the same message if Camel failed to process the message") private int maximumRetryAttempts = 5; @@ -345,11 +345,11 @@ public void setMaxConcurrentConsumers(Integer maxConcurrentConsumers) { this.maxConcurrentConsumers = maxConcurrentConsumers; } - public RetryOperationsInterceptor getRetry() { + public StatelessRetryOperationsInterceptor getRetry() { return retry; } - public void setRetry(RetryOperationsInterceptor retry) { + public void setRetry(StatelessRetryOperationsInterceptor retry) { this.retry = retry; } diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java index e1ecac82520f2..65c3f7d8041ce 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java @@ -43,11 +43,11 @@ import org.springframework.amqp.core.Queue; import org.springframework.amqp.core.QueueBuilder; import org.springframework.amqp.rabbit.AsyncRabbitTemplate; +import org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; import org.springframework.amqp.support.converter.MessageConverter; -import org.springframework.retry.interceptor.RetryOperationsInterceptor; import static org.apache.camel.component.springrabbit.SpringRabbitMQConstants.DIRECT_MESSAGE_LISTENER_CONTAINER; @@ -192,7 +192,7 @@ public class SpringRabbitMQEndpoint extends DefaultEndpoint implements AsyncEndp private Integer maxConcurrentConsumers; @UriParam(label = "consumer,advanced", description = "Custom retry configuration to use. " + "If this is configured then the other settings such as maximumRetryAttempts for retry are not in use.") - private RetryOperationsInterceptor retry; + private StatelessRetryOperationsInterceptor retry; @UriParam(label = "consumer", defaultValue = "5", description = "How many times a Rabbitmq consumer will try the same message if Camel failed to process the message (The number of attempts includes the initial try)") private int maximumRetryAttempts = 5; @@ -520,11 +520,11 @@ public void setMaxConcurrentConsumers(Integer maxConcurrentConsumers) { this.maxConcurrentConsumers = maxConcurrentConsumers; } - public RetryOperationsInterceptor getRetry() { + public StatelessRetryOperationsInterceptor getRetry() { return retry; } - public void setRetry(RetryOperationsInterceptor retry) { + public void setRetry(StatelessRetryOperationsInterceptor retry) { this.retry = retry; } diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/SpringRabbitMQSendDynamicAwareTest.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/SpringRabbitMQSendDynamicAwareTest.java index 901a729b75878..59fc12fff02dd 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/SpringRabbitMQSendDynamicAwareTest.java +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/SpringRabbitMQSendDynamicAwareTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.spi.SendDynamicAware; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQITSupport.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQITSupport.java index c3446354b778f..45434d2738253 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQITSupport.java +++ b/components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQITSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.component.springrabbit.SpringRabbitMQComponent; import org.apache.camel.component.springrabbit.test.infra.services.RabbitMQServiceFactory; import org.apache.camel.test.infra.rabbitmq.services.RabbitMQService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-spring-parent/camel-spring-redis/pom.xml b/components/camel-spring-parent/camel-spring-redis/pom.xml index 89e6733d7611e..14ed118f6f4bb 100644 --- a/components/camel-spring-parent/camel-spring-redis/pom.xml +++ b/components/camel-spring-parent/camel-spring-redis/pom.xml @@ -48,12 +48,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java index 51fb174a422ac..538cc47627ad2 100644 --- a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java +++ b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java @@ -21,7 +21,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveEndpointTest.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveEndpointTest.java index ceb4f20afd6cc..28a49a2affeac 100644 --- a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveEndpointTest.java +++ b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveEndpointTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveRouteTest.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveRouteTest.java index 98f8e3aad71e2..eadb46fcb3cc4 100644 --- a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveRouteTest.java +++ b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisRemoveRouteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java index 64af9927871a7..410c7303e7505 100644 --- a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java +++ b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.RedisTemplate; diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisComponentSpringManualIT.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisComponentSpringManualIT.java index 08f61424ef12e..9c313a5926b8d 100644 --- a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisComponentSpringManualIT.java +++ b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/integration/RedisComponentSpringManualIT.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.redis.RedisConstants; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryManualIT.java b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryManualIT.java index 7faa27efdd0a0..173569449e750 100644 --- a/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryManualIT.java +++ b/components/camel-spring-parent/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryManualIT.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; diff --git a/components/camel-spring-parent/camel-spring-security/pom.xml b/components/camel-spring-parent/camel-spring-security/pom.xml index 70e82e1e9a69a..c555730741347 100644 --- a/components/camel-spring-parent/camel-spring-security/pom.xml +++ b/components/camel-spring-parent/camel-spring-security/pom.xml @@ -92,7 +92,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java b/components/camel-spring-parent/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java index 59548292cecbf..167cae88f7a93 100644 --- a/components/camel-spring-parent/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java +++ b/components/camel-spring-parent/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java @@ -38,8 +38,8 @@ import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.authorization.AuthorizationResult; import org.springframework.security.authorization.event.AuthorizationDeniedEvent; import org.springframework.security.authorization.event.AuthorizationGrantedEvent; import org.springframework.security.core.Authentication; @@ -75,7 +75,7 @@ protected void beforeProcess(Exchange exchange) throws Exception { } Authentication authentication = authenticateIfRequired(authToken); - AuthorizationDecision decision = this.authorizationManager.check(() -> authentication, exchange); + AuthorizationResult decision = this.authorizationManager.authorize(() -> authentication, exchange); // Attempt authorization with exchange try { diff --git a/components/camel-spring-parent/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java b/components/camel-spring-parent/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java index a58d2ec3193e0..84b7ff45ca8f9 100644 --- a/components/camel-spring-parent/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java +++ b/components/camel-spring-parent/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java @@ -24,7 +24,7 @@ import org.apache.camel.CamelAuthorizationException; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-ws/pom.xml b/components/camel-spring-parent/camel-spring-ws/pom.xml index 70e0aaca06e33..21b39638b4e07 100644 --- a/components/camel-spring-parent/camel-spring-ws/pom.xml +++ b/components/camel-spring-parent/camel-spring-ws/pom.xml @@ -132,7 +132,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java index a9cf999a771f5..ecccd9cf2b1c5 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java @@ -23,8 +23,8 @@ import org.apache.camel.component.spring.ws.jaxb.QuoteRequest; import org.apache.camel.model.dataformat.JaxbDataFormat; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java index c3f49c721ad12..116cf633810d5 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java @@ -23,7 +23,7 @@ import javax.xml.transform.stream.StreamSource; import org.apache.camel.component.spring.ws.utils.TestUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java index 7cbcce0b9946b..197839e86d37a 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java @@ -25,7 +25,7 @@ import javax.xml.transform.stream.StreamSource; import org.apache.camel.component.spring.ws.utils.TestUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java index 2978a475b5dd1..f1efffc4e7e4f 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java @@ -25,7 +25,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java index adafb759525c1..87ce2d207e818 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java @@ -25,8 +25,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.spring.ws.bean.CamelEndpointMapping; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java index 8de246226f53a..77dbf7b98eb1e 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java @@ -23,8 +23,8 @@ import org.apache.camel.component.spring.ws.jaxb.QuoteResponse; import org.apache.camel.model.dataformat.JaxbDataFormat; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java index 03665653f3255..cc3f7b2da2974 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java @@ -23,7 +23,7 @@ import net.javacrumbs.smock.springws.client.AbstractSmockClientTest; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java index 4df1037fc975f..c4215695cc331 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java @@ -23,7 +23,7 @@ import net.javacrumbs.smock.springws.client.AbstractSmockClientTest; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java index 8823d3e8fa0e8..64d06f468765f 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.xml.StringSource; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteManualTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteManualTest.java index 13656039776c7..9dac67299a489 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteManualTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteManualTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.camel.util.xml.StringSource; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutManualTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutManualTest.java index dc12638aa3aec..32ca4477f775a 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutManualTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutManualTest.java @@ -21,7 +21,7 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java index 1588891fe47f4..6631e2457c145 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Processor; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java index cea421df6b1e7..8e266526a29b8 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.attachment.AttachmentMessage; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java index 68abb1a88834c..842b1515c671b 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java @@ -26,7 +26,7 @@ import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver; import org.apache.camel.component.spring.ws.utils.TestUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.springframework.ws.client.core.WebServiceTemplate; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java index d8a96d9cb6bff..0d87a73201ae7 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver; import org.apache.camel.component.spring.ws.utils.TestUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.fest.assertions.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java index 656689a508005..085dc07f16b2c 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java @@ -24,7 +24,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.spring.ws.utils.TestUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java index 265e5690feeb6..78cfd89dfc80a 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java @@ -18,7 +18,7 @@ import java.net.URISyntaxException; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ws.soap.addressing.client.ActionCallback; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java index ac6749861071d..b53de29c93e17 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java @@ -18,7 +18,7 @@ import java.net.URISyntaxException; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ws.soap.addressing.client.ActionCallback; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java index ea0899c459bbe..b1887a5973573 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java @@ -18,7 +18,7 @@ import java.net.URISyntaxException; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ws.soap.addressing.client.ActionCallback; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java index b982851a62125..89e9db20ee52d 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java @@ -18,7 +18,7 @@ import java.net.URISyntaxException; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ws.soap.addressing.client.ActionCallback; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java index 268c8f8fcf92f..aac67d06e9f54 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver; import org.apache.camel.component.spring.ws.utils.TestUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.fest.assertions.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java index 6bcb310e2dc76..b44865cb4eae3 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver; import org.apache.camel.component.spring.ws.utils.TestUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.fest.assertions.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java index edf88be863114..055a233e13035 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.component.spring.ws.SpringWebserviceConstants; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.fest.assertions.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderManualTest.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderManualTest.java index e24cdc6f6abd6..785766fcddb4e 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderManualTest.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderManualTest.java @@ -20,7 +20,7 @@ import net.javacrumbs.calc.model.PlusResponse; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-spring-parent/camel-spring-xml/pom.xml b/components/camel-spring-parent/camel-spring-xml/pom.xml index 59c5c93c69572..b11800c903b6b 100644 --- a/components/camel-spring-parent/camel-spring-xml/pom.xml +++ b/components/camel-spring-parent/camel-spring-xml/pom.xml @@ -101,7 +101,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java index a7d46980294a2..290260e4f7e92 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringMDCTransactedTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java index 5a5341be0b0dc..e04be02fdc821 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/Camel14624Test.java @@ -21,7 +21,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.spi.TransactedPolicy; import org.apache.camel.spring.spi.SpringTransactionPolicy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; diff --git a/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java b/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java index 53c68e9650940..07c8e16746c53 100644 --- a/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java +++ b/components/camel-spring-parent/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java @@ -53,7 +53,7 @@ protected void processProperties(ConfigurableListableBeanFactory beanFactoryToPr properties.putAll(props); // create helper helper = new PropertyPlaceholderHelper( - placeholderPrefix, placeholderSuffix, valueSeparator, ignoreUnresolvablePlaceholders); + placeholderPrefix, placeholderSuffix, valueSeparator, escapeCharacter, ignoreUnresolvablePlaceholders); } public int getSystemPropertiesMode() { diff --git a/components/camel-spring-parent/camel-undertow-spring-security/pom.xml b/components/camel-spring-parent/camel-undertow-spring-security/pom.xml index fbd03684aab1c..4295ebd7b6301 100644 --- a/components/camel-spring-parent/camel-undertow-spring-security/pom.xml +++ b/components/camel-spring-parent/camel-undertow-spring-security/pom.xml @@ -61,7 +61,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java index adbb3b2c2bcf1..ce4199c581bb0 100644 --- a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java +++ b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java @@ -33,7 +33,7 @@ import org.apache.camel.component.spring.security.keycloak.KeycloakUsernameSubClaimAdapter; import org.apache.camel.component.undertow.UndertowComponent; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.springframework.security.oauth2.jwt.Jwt; diff --git a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java index c9a5752473549..30ae2e0ff7a1e 100644 --- a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java +++ b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java index 78bd4cedc7ffc..45e05fa17ae16 100644 --- a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java +++ b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml index 2c6505a7ef1c7..21b4c8262a7ec 100644 --- a/components/camel-sql/pom.xml +++ b/components/camel-sql/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java index fce63e5fd0039..6182db65be811 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/ProducerBatchSimpleExpTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/ProducerBatchSimpleExpTest.java index b7a0007976804..7c7399b22fc38 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/ProducerBatchSimpleExpTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/ProducerBatchSimpleExpTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java index d10db9aaaa8f9..d18b0c2500b68 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.sql; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java index 1d7421f8eec68..c8a01a5f72f5c 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SpringSqlMultilineTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.sql; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java index d3c2c4521a456..e51564b248d53 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java @@ -21,14 +21,14 @@ import org.apache.camel.builder.AggregationStrategies; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlAggregateBatchTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java index a048875ea4ab1..1b7a883201759 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java index 5898cf9d578ad..77a065f303dbc 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java index 23abad76c008b..f59b0c8c1db28 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java index ff460273875f9..578516cb3f31a 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java index e8bd040420c13..7a1c28e74227b 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerFetchSizeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerFetchSizeTest.java index 29e6f1646493e..fa012afc93a04 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerFetchSizeTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerFetchSizeTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java index d1d93fb0b140e..60f3116567f7f 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java index 2786b8369af90..bf1760a898508 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java @@ -22,13 +22,13 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java index 7f5b326ebcc46..f9015d2387c9d 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java @@ -21,13 +21,13 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java index c65fdd1947260..a9a30e3ce785e 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java index 99bc82e138176..e3e0415aa55d6 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java index ff495798ff592..f6f003fb28aa4 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java @@ -22,13 +22,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlDataSourceRefTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java index 9504806cfb733..d3c576abdd301 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java @@ -22,13 +22,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlDataSourceTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java index 20995c8d2ad09..0e01e11e36647 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java index 1d0d00ed06ce3..9dad48e4edcb7 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java index 6db3c7a268ed8..7375d5bb644d3 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java @@ -19,7 +19,7 @@ import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.PropertyBindingException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java index 805bba4c7736f..5ecec241186f0 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysInLoopTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysInLoopTest.java index 48f3efe947da7..a9c6ad1b49fe9 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysInLoopTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysInLoopTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java index 2433af803b096..5d4445df24ac1 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java index 5a2beac00ec95..4437177735feb 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java index 41f5858565540..a6fb15e519f33 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java @@ -25,13 +25,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java index 6203f3e6d38ea..f91069fe1efe2 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java @@ -25,13 +25,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java index 94d7cdc165596..b790b9b4c5763 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java index b4003aa7a1879..723832040761d 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java @@ -27,13 +27,13 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerConcurrentTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java index 34c098d5a3600..e93256fd39716 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java index c770100868fab..9cc1253c42790 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java @@ -22,13 +22,13 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerExpressionParameterTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java index 49f580572b1e3..052c4e9a4be42 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java index 98ac9d2488bfa..f06e8780857d3 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java index 75bdde57a6f65..336e9ed454419 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java index 8b8cae5211ee8..09f368d1bc1f3 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java index 0d1b50db75f88..9b04f11cd70d8 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNonNamedParametersTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNonNamedParametersTest.java index e5badfcd9ae91..7e7369d1d8bed 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNonNamedParametersTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNonNamedParametersTest.java @@ -22,13 +22,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java index 3178fbbe2bb08..08bf6d4a1601a 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java @@ -22,13 +22,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java index 9ee2ded206b75..b3cf002abec3d 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java index 679eb85215592..2a313ad9b9e6b 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java index 8e980bef0311b..527ddded29938 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java @@ -22,13 +22,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerNamedParameterTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java index 0666c1a035f9a..ad214d6025c34 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java @@ -22,13 +22,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerNamedParametersTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java index c16d6fc5c7d04..92d823434dcd4 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java index eff125b1e384b..0919af752b5ee 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java @@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerNullBodyHeaderTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java index 373f8208662ad..23b7c53609be9 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java @@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerNullBodyTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java index a57f2b7f37fa3..6d836414edb99 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java index b6b8e87667a76..aa5dd218f0249 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java index 78a31da3e9022..7ae68ccd9e807 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java @@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerOutputTypeSelectListTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java index 1927fe8649958..35403f90a130c 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java @@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerOutputTypeSelectListWithClassTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java index 18514dbd361fb..464ff03d9d36b 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java @@ -19,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java index 337472813d460..748136d1ea81f 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java index 2ea1883eb6184..d9ece982c569c 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java @@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerParametersCountTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java index b8b128459e5c5..323a6463b9599 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java @@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlProducerReuseParameterTest extends CamelTestSupport { diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java index 7704879dc535d..b431ca316321a 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java index 2aca173523f8f..44a5b8e53c5d7 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java @@ -22,7 +22,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java index d0691f1e1d593..bdaefaa80ff17 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java @@ -23,13 +23,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java index c6ec48d530622..427ad30729d89 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java index a730e460d72ab..638d9da1cce9f 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java @@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.dao.DataAccessException; import org.springframework.dao.EmptyResultDataAccessException; @@ -38,7 +38,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java index 1bfb6a1e8b2f6..35f3f4f9c4435 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; import org.apache.camel.spring.spi.SpringTransactionPolicy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java index db084f27297e3..c8cf78b537081 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.sql.stored.template.TemplateParser; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.dao.DataAccessException; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java index 3d0ba740bdf12..07dfd5c46c765 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java @@ -32,7 +32,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java index 6e5cd3e6be66d..c2cb662cb5f16 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java @@ -21,13 +21,13 @@ import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.TypeConversionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java index c5ef458178ab6..53324b58a66c8 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java index 597451b4c1238..5cae4169500f5 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBodyArrayTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java index ffc218d4f9ff1..6f783b8476452 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerNamedParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerNamedParameterTest.java index f7dd6f444ad0a..5f2292000c66f 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerNamedParameterTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerNamedParameterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java index 5708ece6c719d..fc62fb7f8530a 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java index 05a614c8a6b1e..1ce48a217f25d 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerUseMessageBodyForTemplateTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java index 6a9032e746edc..eab747df4ec99 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlFunctionDataSourceTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java index a677a044f3c73..5ee3c6158d785 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java index 4f4570e1019ab..5796f7951b75d 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/TemplateCacheTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import org.apache.camel.component.sql.stored.template.TemplateParser; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; 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 7d5c3059fd71e..e8cf00e275b2a 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 @@ -18,7 +18,7 @@ import org.apache.camel.AggregationStrategy; import org.apache.camel.Exchange; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.springframework.context.support.AbstractApplicationContext; public abstract class AbstractClusteredJdbcAggregationTestSupport extends CamelSpringTestSupport { 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 a4d44df788bf1..4b7568964bdda 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 @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.OptimisticLockingAggregationRepository; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.camel.util.ObjectHelper; import org.springframework.context.support.AbstractApplicationContext; 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 f06552e9f9903..3ffe507141946 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 @@ -23,7 +23,7 @@ import javax.sql.DataSource; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; 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 6451048219cf2..1d7b86207b6af 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 @@ -24,7 +24,7 @@ import javax.sql.DataSource; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java index 99b8a1e1a524b..adffaf615a4ad 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryMultipleRepoTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodecTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodecTest.java index 760db062594a5..8b5c67c4e3647 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodecTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcCamelCodecTest.java @@ -18,7 +18,7 @@ import java.io.*; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java index bea6ff78f185f..d24b977c2ed93 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java index ff7aed2149c5b..6382bd7b05e48 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java index b08b284853f80..5e988c40ac7a1 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcCachedMessageIdRepositoryTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcCachedMessageIdRepositoryTest.java index e33ab7b330664..ca07515441fa9 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcCachedMessageIdRepositoryTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcCachedMessageIdRepositoryTest.java @@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryCustomTableNameTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryCustomTableNameTest.java index eb7ffec29323c..4fd5735a14b5f 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryCustomTableNameTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryCustomTableNameTest.java @@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java index 316dddb12790f..d4e13113c64c3 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.RouteDefinition; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml index aeec3de0f4e71..bbb2f526bfd4c 100644 --- a/components/camel-ssh/pom.xml +++ b/components/camel-ssh/pom.xml @@ -65,7 +65,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java index 50a1c50901650..a7beaf27b446b 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java @@ -22,7 +22,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.sshd.client.ClientBuilder; import org.apache.sshd.client.SshClient; diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java index 9a011e18326e3..29e0e604efd61 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java @@ -20,7 +20,7 @@ import java.nio.file.Paths; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.sshd.common.keyprovider.FileKeyPairProvider; import org.apache.sshd.server.SshServer; diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml index ba57027b1ad89..4f2a333948407 100644 --- a/components/camel-stax/pom.xml +++ b/components/camel-stax/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java index 26997979a1ec3..2f22416ade015 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.stax.model.Product; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java index 9a0176a5fc812..a7deff6ad49c4 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.stax.model.Record; import org.apache.camel.component.stax.model.RecordsUtil; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java index e5c5f96cf3a6e..6de00e240f648 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java @@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.stax.model.RecordsUtil; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java index 53ac86fab4bcb..ce99725187e8c 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.stax.model.RecordsUtil; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java index c11a1d880674d..a0e16672880b1 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.stax.model.Record; import org.apache.camel.component.stax.model.RecordsUtil; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java index ad48737fe725d..3edda4fa68ed2 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.stax.model.Order; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.apache.camel.util.TimeUtils; import org.junit.jupiter.api.Disabled; @@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory; import static org.apache.camel.component.stax.StAXBuilder.stax; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupMultiXmlTokenTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupMultiXmlTokenTest.java index 5bb46343b7127..155ecc4ee4f94 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupMultiXmlTokenTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupMultiXmlTokenTest.java @@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java index 0297dafae790c..af23b6ccba701 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java @@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.java index 0247dbd38fc67..30be144f65542 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.java @@ -21,8 +21,8 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +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.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenSplitTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenSplitTest.java index 13e32f27b0497..4d477e0518a6c 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenSplitTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenSplitTest.java @@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageGroupingTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageGroupingTest.java index 6fd4822be08b1..913a54857b9d0 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageGroupingTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageGroupingTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.xmlunit.assertj3.XmlAssert; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingFileTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingFileTest.java index 7b39662d63c56..5a0616efc2736 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingFileTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingFileTest.java @@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +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.io.TempDir; import org.xmlunit.assertj3.XmlAssert; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageTest.java index 09c2c601082fc..75d1df08e1df8 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.xmlunit.assertj3.XmlAssert; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java index d56f9b2abdee2..7267b344ea801 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.xmlunit.assertj3.XmlAssert; diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageTest.java index fa184a1a82477..fdc905aa3602b 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.xmlunit.assertj3.XmlAssert; diff --git a/components/camel-stitch/pom.xml b/components/camel-stitch/pom.xml index d8050fda59240..266f5d812c15b 100644 --- a/components/camel-stitch/pom.xml +++ b/components/camel-stitch/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchComponentTest.java b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchComponentTest.java index b05702392a47d..a71a2a9d20537 100644 --- a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchComponentTest.java +++ b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchComponentTest.java @@ -18,7 +18,7 @@ import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.component.stitch.client.StitchRegion; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java index 1c8570b1e14e3..44bc83002a2da 100644 --- a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java +++ b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java @@ -36,7 +36,7 @@ import org.apache.camel.component.stitch.client.models.StitchResponse; import org.apache.camel.component.stitch.client.models.StitchSchema; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; diff --git a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/integration/StitchProducerIT.java b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/integration/StitchProducerIT.java index 50d540e09b595..52e7f83525de5 100644 --- a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/integration/StitchProducerIT.java +++ b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/integration/StitchProducerIT.java @@ -33,7 +33,7 @@ import org.apache.camel.component.stitch.client.models.StitchRequestBody; import org.apache.camel.component.stitch.client.models.StitchSchema; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/StitchProducerOperationsTest.java b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/StitchProducerOperationsTest.java index a3dc7d7af8eea..483448b2aff09 100644 --- a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/StitchProducerOperationsTest.java +++ b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/StitchProducerOperationsTest.java @@ -36,7 +36,7 @@ import org.apache.camel.component.stitch.client.models.StitchResponse; import org.apache.camel.component.stitch.client.models.StitchSchema; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; diff --git a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/integration/StitchProducerOperationsIT.java b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/integration/StitchProducerOperationsIT.java index 2394d21df0542..d3ce9616892ab 100644 --- a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/integration/StitchProducerOperationsIT.java +++ b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/operations/integration/StitchProducerOperationsIT.java @@ -37,7 +37,7 @@ import org.apache.camel.component.stitch.client.models.StitchSchema; import org.apache.camel.component.stitch.operations.StitchProducerOperations; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml index 11ff12504fb79..8ef2d4c504c01 100644 --- a/components/camel-stomp/pom.xml +++ b/components/camel-stomp/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java index 31ac1f591494a..9cf7cadd4708d 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java @@ -28,7 +28,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.infra.artemis.services.ArtemisEmbeddedServiceBuilder; import org.apache.camel.test.infra.artemis.services.ArtemisService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.fusesource.stomp.client.Stomp; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-stream/pom.xml b/components/camel-stream/pom.xml index 446d9afa2cc97..8c653a7efc9d2 100644 --- a/components/camel-stream/pom.xml +++ b/components/camel-stream/pom.xml @@ -45,7 +45,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java index 20a403dd78629..49660302ba083 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java @@ -22,11 +22,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java index 37670ef040c2b..2c34e70ecc4d6 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java @@ -19,12 +19,12 @@ import java.io.File; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Unit test for scan stream file diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java index 6682e707193bd..d7d75fcd2c40f 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java @@ -21,11 +21,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Unit test for scan stream file diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java index c1e104f742fd8..0499f3b776a0b 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java @@ -21,11 +21,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Unit test for scan stream file diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java index faad61c2a122e..88f6ecc0d375b 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java @@ -21,12 +21,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.converter.IOConverter; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.stream.StreamGroupLinesTest.LS; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; public class SplitStreamFileTest extends CamelTestSupport { diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java index 3015316a7a2af..72fd3336fd756 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.stream; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Test; diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java index 895ebcf7ad569..b394e90cc9d79 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.stream; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java index 952ee3f0ccda5..274fb589ef91d 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java @@ -25,12 +25,12 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.stream.StreamGroupLinesTest.LS; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Unit test for stream file diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java index 30fae8e999409..edfd7c9a3b26f 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java @@ -22,11 +22,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; public class StreamGroupLinesTest extends CamelTestSupport { diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java index 839570721524d..87bb5fa71e0b0 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java @@ -19,7 +19,7 @@ import java.io.OutputStream; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.stream.StreamGroupLinesTest.LS; diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java index 481a82bf8d1b8..bff505bac526b 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.stream; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class StreamRouteBuilderTest extends CamelTestSupport { diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java index a1b352e8757e9..b340c1e29295a 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.stream; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutNewLineOffTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutNewLineOffTest.java index 7e4e362aba908..c75f5eba5730a 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutNewLineOffTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutNewLineOffTest.java @@ -20,7 +20,7 @@ import java.io.PrintStream; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java index 66ee47e5b9961..aa6fd5220e226 100644 --- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java +++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java @@ -20,7 +20,7 @@ import java.io.PrintStream; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.stream.StreamGroupLinesTest.LS; diff --git a/components/camel-stringtemplate/pom.xml b/components/camel-stringtemplate/pom.xml index 175ceef3932d0..c5f5b14a85e1d 100644 --- a/components/camel-stringtemplate/pom.xml +++ b/components/camel-stringtemplate/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java index 9ad3301440c49..b05e28c4e8d95 100644 --- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java +++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class StringTemplateConcurrentTest extends CamelTestSupport { diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java index fecc83fe17806..eaabd1729118c 100644 --- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java +++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java @@ -25,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java index d6d62bff07bc6..57a7121b1ed4d 100644 --- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java +++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java index 0bf338005c500..7b6002e77aa68 100644 --- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java +++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateRefTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateRefTest.java index b04cd0b49d634..8ac5ba8785275 100644 --- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateRefTest.java +++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateRefTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java index ba476fdfd482c..52d522202d2aa 100644 --- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java +++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateViaHeaderTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateViaHeaderTest.java index 41d902adea304..2dbd568364335 100644 --- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateViaHeaderTest.java +++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateViaHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-stripe/pom.xml b/components/camel-stripe/pom.xml index e82b38766c45d..bd0a7f977263f 100644 --- a/components/camel-stripe/pom.xml +++ b/components/camel-stripe/pom.xml @@ -58,7 +58,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-stripe/src/test/java/org/apache/camel/component/stripe/integration/StripeIntegrationTestSupport.java b/components/camel-stripe/src/test/java/org/apache/camel/component/stripe/integration/StripeIntegrationTestSupport.java index ea7ac239aeae8..73011d91239fe 100644 --- a/components/camel-stripe/src/test/java/org/apache/camel/component/stripe/integration/StripeIntegrationTestSupport.java +++ b/components/camel-stripe/src/test/java/org/apache/camel/component/stripe/integration/StripeIntegrationTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.stripe.integration; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; public abstract class StripeIntegrationTestSupport extends CamelTestSupport { diff --git a/components/camel-swift/pom.xml b/components/camel-swift/pom.xml index 7e863aba6580f..17eb2f56f8fc6 100644 --- a/components/camel-swift/pom.xml +++ b/components/camel-swift/pom.xml @@ -60,12 +60,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SpringSwiftMtDataFormatTest.java b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SpringSwiftMtDataFormatTest.java index a81ba483ce1b1..f089029881a87 100644 --- a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SpringSwiftMtDataFormatTest.java +++ b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SpringSwiftMtDataFormatTest.java @@ -24,7 +24,7 @@ import com.prowidesoftware.swift.model.mt.mt1xx.MT103; import com.prowidesoftware.swift.model.mt.mt5xx.MT515; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java index f86dd5b85f7e4..c4e88c499498e 100644 --- a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java +++ b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mt/SwiftMtDataFormatTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.SwiftMtDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SpringSwiftMxDataFormatTest.java b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SpringSwiftMxDataFormatTest.java index f7466bc88277c..01415a6833968 100644 --- a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SpringSwiftMxDataFormatTest.java +++ b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SpringSwiftMxDataFormatTest.java @@ -28,7 +28,7 @@ import com.prowidesoftware.swift.model.mx.MxPacs00800107; import com.prowidesoftware.swift.model.mx.sys.MxXsys01100102; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java index 1846fb3b02b1c..d7182bf80c380 100644 --- a/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java +++ b/components/camel-swift/src/test/java/org/apache/camel/dataformat/swift/mx/SwiftMxDataFormatTest.java @@ -32,7 +32,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.SwiftMxDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml index c1972be287d0d..efb38a2a88e7b 100644 --- a/components/camel-syslog/pom.xml +++ b/components/camel-syslog/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java index 91665752b6abe..83470c21bd99f 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java index 5e7bc3a578ab5..2f8af0c01623d 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java index f17c27e55c8ac..d95b211ebd63e 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java index 721a9b79d93ce..ea26bc6c41d75 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java index 73cea6d376e00..09bbb6b45955b 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java index 0a69ad40d0721..1738732f81929 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java @@ -27,7 +27,7 @@ import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java index b52bfc6feaa73..b21b3826bc494 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java @@ -26,7 +26,7 @@ import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java index 9401d38212b6c..16c689c609247 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java index f987e48bae691..d2c14af852c35 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-tahu/pom.xml b/components/camel-tahu/pom.xml index 514129c78b751..3b930b0a987d6 100644 --- a/components/camel-tahu/pom.xml +++ b/components/camel-tahu/pom.xml @@ -155,7 +155,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/SparkplugTCKService.java b/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/SparkplugTCKService.java index 0dee6be37f1ce..7344d580dccd1 100644 --- a/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/SparkplugTCKService.java +++ b/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/SparkplugTCKService.java @@ -39,7 +39,7 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.bodyAs; +import static org.apache.camel.test.junit6.TestSupport.bodyAs; public final class SparkplugTCKService implements TestService { diff --git a/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/TahuConfigurationTest.java b/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/TahuConfigurationTest.java index 9f9124c0f9810..03d728885fa42 100644 --- a/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/TahuConfigurationTest.java +++ b/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/TahuConfigurationTest.java @@ -18,8 +18,8 @@ import java.util.List; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.eclipse.tahu.model.MqttServerDefinition; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-tarfile/pom.xml b/components/camel-tarfile/pom.xml index 382281ac1017b..d4b4d905101f7 100644 --- a/components/camel-tarfile/pom.xml +++ b/components/camel-tarfile/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -58,7 +58,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java index 7932fc0d4fff6..61eaaeed64550 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -35,7 +35,7 @@ import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes; import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText; import static org.apache.camel.dataformat.tarfile.TarUtils.toEntries; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java index d7b32b21f0c4c..a33e962ecc6e6 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java @@ -17,7 +17,7 @@ package org.apache.camel.dataformat.tarfile; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java index 115ec33930190..4ae92ca8197e2 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java @@ -36,7 +36,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.tarfile.TarUtils.EntryMetadata; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; @@ -48,7 +48,7 @@ import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes; import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText; import static org.apache.camel.dataformat.tarfile.TarUtils.toEntries; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java index 0345c724781e3..9d96e2f40c3cf 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java @@ -28,11 +28,11 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; class TarFileSplitAndDeleteTest extends CamelTestSupport { diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitIteratorCorruptTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitIteratorCorruptTest.java index f68c6543d3323..541eeb0eba116 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitIteratorCorruptTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitIteratorCorruptTest.java @@ -22,7 +22,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; class TarFileSplitIteratorCorruptTest extends CamelTestSupport { diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java index ca00cd17fcbeb..27f9e90e917f5 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java @@ -20,11 +20,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; class TarSplitterRouteIssueTest extends CamelTestSupport { diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java index a61c504987aea..225cc1030ac51 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class TarSplitterRouteTest extends CamelTestSupport { diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java index 45c4e1770d865..7429a1722606e 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java @@ -25,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; @@ -33,7 +33,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java index a014c5cbdefde..41541bf50c840 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java @@ -24,14 +24,14 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java index 31e50d234a1f8..81dcc31241885 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java @@ -28,8 +28,8 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyNullBodyTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyNullBodyTest.java index babf48ea3a400..dabfb83a60f99 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyNullBodyTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyNullBodyTest.java @@ -24,8 +24,8 @@ import java.util.TreeMap; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.IOHelper; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java index 91b3aba1ad9e2..e2bc33aa29ff9 100644 --- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java +++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java @@ -21,14 +21,14 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml index b3c4d86aef92d..c8229155a3fa5 100644 --- a/components/camel-telegram/pom.xml +++ b/components/camel-telegram/pom.xml @@ -69,7 +69,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java index bd28045447c65..8a29f56a727d2 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java @@ -30,7 +30,7 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java index b49bebcfbbf75..5dc1d4ae28c2f 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java @@ -30,7 +30,7 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java index 8d1d1211749a0..5b8f6b27a9b58 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.telegram.util.TelegramTestUtil; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java index 7a4c4dd588de8..955437ea1fb7c 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java @@ -27,7 +27,7 @@ import org.apache.camel.component.telegram.model.OutgoingTextMessage; import org.apache.camel.component.telegram.model.ReplyKeyboardMarkup; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; /** diff --git a/components/camel-telemetry-dev/pom.xml b/components/camel-telemetry-dev/pom.xml index 9c5a758b1c032..0960e831cb485 100644 --- a/components/camel-telemetry-dev/pom.xml +++ b/components/camel-telemetry-dev/pom.xml @@ -50,7 +50,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/SpanPropagationDownstreamTest.java b/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/SpanPropagationDownstreamTest.java index 897aceaba7609..840a3b2e18002 100644 --- a/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/SpanPropagationDownstreamTest.java +++ b/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/SpanPropagationDownstreamTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java b/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java index 7ec4bdad96224..56f63d67d5c32 100644 --- a/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java +++ b/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.telemetry.Op; import org.apache.camel.telemetry.TagConstants; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.RollingFileAppender; diff --git a/components/camel-telemetry/pom.xml b/components/camel-telemetry/pom.xml index 2bc65f85fe212..b8a3585997179 100644 --- a/components/camel-telemetry/pom.xml +++ b/components/camel-telemetry/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncCXFTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncCXFTest.java index 8cab48604aee5..011e8213f9dba 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncCXFTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncCXFTest.java @@ -28,7 +28,7 @@ import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncDirectTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncDirectTest.java index cebe375f01b00..a8a417e7e62f5 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncDirectTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncDirectTest.java @@ -27,7 +27,7 @@ import org.apache.camel.telemetry.mock.MockSpanAdapter; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncTest.java index 862527b0979b8..78e0824e65b5d 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncTest.java @@ -27,7 +27,7 @@ import org.apache.camel.telemetry.mock.MockSpanAdapter; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncWiretapTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncWiretapTest.java index b63ef386d1612..e08ca11974b70 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncWiretapTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/AsyncWiretapTest.java @@ -27,7 +27,7 @@ import org.apache.camel.telemetry.mock.MockSpanAdapter; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/DisableEndpointTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/DisableEndpointTest.java index 4c3cdf4a79e68..c74e930b00883 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/DisableEndpointTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/DisableEndpointTest.java @@ -28,7 +28,7 @@ import org.apache.camel.telemetry.mock.MockSpanAdapter; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/EnableProcessorsTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/EnableProcessorsTest.java index ef01429896110..a2d2ddbb564f2 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/EnableProcessorsTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/EnableProcessorsTest.java @@ -28,7 +28,7 @@ import org.apache.camel.telemetry.mock.MockSpanAdapter; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/HeadersTraceTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/HeadersTraceTest.java index 06358fb2ad655..cce41c81d2032 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/HeadersTraceTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/HeadersTraceTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanLifecycleManagerTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanLifecycleManagerTest.java index fd454e533b29e..ceefe59e720c8 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanLifecycleManagerTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanLifecycleManagerTest.java @@ -27,7 +27,7 @@ import org.apache.camel.telemetry.mock.MockSpanAdapter; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationDownstreamTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationDownstreamTest.java index fdafde816f5c4..dbaf38241a28a 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationDownstreamTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationDownstreamTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationUpstreamTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationUpstreamTest.java index 0543668f48ad8..45cc960942bfc 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationUpstreamTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanPropagationUpstreamTest.java @@ -26,7 +26,7 @@ import org.apache.camel.telemetry.mock.MockSpanAdapter; import org.apache.camel.telemetry.mock.MockTrace; import org.apache.camel.telemetry.mock.MockTracer; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanStorageManagerExchangeTest.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanStorageManagerExchangeTest.java index d1d31d73e6120..f1dd4c6bbff66 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanStorageManagerExchangeTest.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/SpanStorageManagerExchangeTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Exchange; import org.apache.camel.telemetry.mock.MockSpanAdapter; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-test/camel-test-junit5/pom.xml b/components/camel-test/camel-test-junit5/pom.xml index 305e1b8c66aa8..a8659e50398dc 100644 --- a/components/camel-test/camel-test-junit5/pom.xml +++ b/components/camel-test/camel-test-junit5/pom.xml @@ -38,6 +38,18 @@ Test JUnit5 + + + + org.junit + junit-bom + ${junit-jupiter-version} + pom + import + + + + org.apache.camel diff --git a/components/camel-test/camel-test-junit6/pom.xml b/components/camel-test/camel-test-junit6/pom.xml index ff6522b9f6e5d..22901fc2f7aac 100644 --- a/components/camel-test/camel-test-junit6/pom.xml +++ b/components/camel-test/camel-test-junit6/pom.xml @@ -38,18 +38,6 @@ Test JUnit6 - - - - org.junit - junit-bom - ${junit6-jupiter-version} - pom - import - - - - org.apache.camel diff --git a/components/camel-test/camel-test-main-junit6/pom.xml b/components/camel-test/camel-test-main-junit6/pom.xml index 9dec84ab81621..8013d3764024e 100644 --- a/components/camel-test/camel-test-main-junit6/pom.xml +++ b/components/camel-test/camel-test-main-junit6/pom.xml @@ -38,19 +38,6 @@ Test Main JUnit6 - - - - org.junit - junit-bom - ${junit6-jupiter-version} - pom - import - - - - - org.apache.camel diff --git a/components/camel-test/camel-test-spring-junit6/pom.xml b/components/camel-test/camel-test-spring-junit6/pom.xml index e5d1cc02ec4f4..af36cdc0adc05 100644 --- a/components/camel-test/camel-test-spring-junit6/pom.xml +++ b/components/camel-test/camel-test-spring-junit6/pom.xml @@ -38,18 +38,6 @@ Test Spring JUnit6 - - - - org.junit - junit-bom - ${junit6-jupiter-version} - pom - import - - - - org.apache.camel diff --git a/components/camel-threadpoolfactory-vertx/pom.xml b/components/camel-threadpoolfactory-vertx/pom.xml index 716a619bf41bb..26f874a7d76be 100644 --- a/components/camel-threadpoolfactory-vertx/pom.xml +++ b/components/camel-threadpoolfactory-vertx/pom.xml @@ -54,7 +54,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java index ff0ef76a6c565..ec60bc476b41a 100644 --- a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java +++ b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.ThreadPoolProfileBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.reactive.vertx.VertXThreadPoolFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java index 9e255cb0b0608..4e68eeadcdc87 100644 --- a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java +++ b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java index 74b08a66ce7e2..dbca4692094cc 100644 --- a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java +++ b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.reactive.vertx.VertXThreadPoolFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml index 46cbe479187bf..2d5cdbe2e3efd 100644 --- a/components/camel-thrift/pom.xml +++ b/components/camel-thrift/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java index bdd49e6a32d82..385193872e404 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java @@ -30,7 +30,7 @@ import org.apache.camel.component.thrift.generated.Operation; import org.apache.camel.component.thrift.generated.Work; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.async.AsyncMethodCallback; import org.apache.thrift.async.TAsyncClientManager; import org.apache.thrift.protocol.TBinaryProtocol; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java index c0fdd4e93b569..0ed09a8bf5acf 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java @@ -28,7 +28,7 @@ import org.apache.camel.component.thrift.generated.Operation; import org.apache.camel.component.thrift.generated.Work; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.TException; import org.apache.thrift.async.AsyncMethodCallback; import org.apache.thrift.async.TAsyncClientManager; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java index 1d109491a7c67..3f33e34a992fe 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java @@ -26,7 +26,7 @@ import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TSSLTransportFactory; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java index 743ccebe67062..d531b1e37e8b2 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.thrift.generated.Operation; import org.apache.camel.component.thrift.generated.Work; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TSocket; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java index cf9a5fe6be0b5..89fbf97bb6255 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.thrift.generated.Operation; import org.apache.camel.component.thrift.generated.Work; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.TConfiguration; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java index 2a5cd363b70bf..3126ecb62ba94 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java @@ -19,7 +19,7 @@ import org.apache.camel.component.thrift.generated.Calculator; import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.server.THsHaServer; import org.apache.thrift.server.THsHaServer.Args; import org.apache.thrift.server.TServer; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java index 8c7999c06fba4..19a3e83696e09 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java @@ -35,7 +35,7 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.server.TServer; import org.apache.thrift.server.TThreadPoolServer; import org.apache.thrift.transport.TSSLTransportFactory; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java index daab82ffff185..6b1aa9b1673bb 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java @@ -27,7 +27,7 @@ import org.apache.camel.component.thrift.generated.Work; import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.server.TServer; import org.apache.thrift.server.TThreadPoolServer; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java index eaa1644a22a0d..34a06ddbf515d 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl; import org.apache.camel.component.thrift.server.ThriftThreadPoolServer; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.thrift.TException; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java index df3a605d476bf..719616fbc2361 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.thrift.generated.Operation; import org.apache.camel.dataformat.thrift.generated.Work; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java index cf8b6ca02c78e..93897efa39a19 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.thrift.generated.Operation; import org.apache.camel.dataformat.thrift.generated.Work; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java index ce96c9daebd3d..ae79ee97d03e6 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.thrift.generated.Operation; import org.apache.camel.dataformat.thrift.generated.Work; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-thymeleaf/pom.xml b/components/camel-thymeleaf/pom.xml index bb17c53ac1934..ca48194296dc1 100644 --- a/components/camel-thymeleaf/pom.xml +++ b/components/camel-thymeleaf/pom.xml @@ -46,7 +46,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafAbstractBaseTest.java b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafAbstractBaseTest.java index 525a949a8a7c9..661c933ef5ed9 100644 --- a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafAbstractBaseTest.java +++ b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafAbstractBaseTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import static java.util.Map.entry; diff --git a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafComponentTest.java b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafComponentTest.java index efdb1b993b13b..d579301f1a458 100644 --- a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafComponentTest.java +++ b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafComponentTest.java @@ -21,7 +21,7 @@ import java.util.UUID; import org.apache.camel.support.PropertyBindingListener; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.ITemplateResolver; diff --git a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafConcurrentTest.java b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafConcurrentTest.java index d38f6796379ff..ce98122a01744 100644 --- a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafConcurrentTest.java +++ b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafConcurrentTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class ThymeleafConcurrentTest extends ThymeleafAbstractBaseTest { diff --git a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafSetHeaderTest.java b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafSetHeaderTest.java index 34519fb605796..e892e6b8951a8 100644 --- a/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafSetHeaderTest.java +++ b/components/camel-thymeleaf/src/test/java/org/apache/camel/component/thymeleaf/ThymeleafSetHeaderTest.java @@ -18,7 +18,7 @@ import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml index ccd178ed16018..294304596027f 100644 --- a/components/camel-tika/pom.xml +++ b/components/camel-tika/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java index d9e638797dee4..ab7b684d9b127 100644 --- a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java +++ b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java index 174d452bd0048..500947de9087d 100644 --- a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java +++ b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java @@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.txt.UniversalEncodingDetector; import org.junit.jupiter.api.Test; diff --git a/components/camel-tracing/pom.xml b/components/camel-tracing/pom.xml index 3022ed102ec4c..8dc74dc3fb73d 100644 --- a/components/camel-tracing/pom.xml +++ b/components/camel-tracing/pom.xml @@ -45,7 +45,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/ActiveSpanManagerTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/ActiveSpanManagerTest.java index b19798d812a6d..46781f6d0efe3 100644 --- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/ActiveSpanManagerTest.java +++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/ActiveSpanManagerTest.java @@ -17,7 +17,7 @@ package org.apache.camel.tracing; import org.apache.camel.Exchange; -import org.apache.camel.test.junit5.ExchangeTestSupport; +import org.apache.camel.test.junit6.ExchangeTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml index 5beca7ead9291..4cbc00a9307d2 100644 --- a/components/camel-twilio/pom.xml +++ b/components/camel-twilio/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java index 753c6be000287..7fc2d77daf6f6 100644 --- a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java +++ b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java @@ -23,8 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml index a4310290dd2f5..2d6de122054a8 100644 --- a/components/camel-twitter/pom.xml +++ b/components/camel-twitter/pom.xml @@ -49,7 +49,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterITSupport.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterITSupport.java index 8eca775911f14..48ea79fd710ad 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterITSupport.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterITSupport.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml index e708c938396fe..5385c9319d5d2 100644 --- a/components/camel-undertow/pom.xml +++ b/components/camel-undertow/pom.xml @@ -70,12 +70,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java index 93f4d47b41733..07b49090ebcb7 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java @@ -22,7 +22,7 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.CamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; /** diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java index c733171a789ef..d5852263aa3c0 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java @@ -25,7 +25,7 @@ import org.apache.camel.http.base.cookie.ExchangeCookieHandler; import org.apache.camel.http.base.cookie.InstanceCookieHandler; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java index bc27dc676dd0d..63d13d573cbed 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java index 9a7da175370ad..56170564b13d7 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java @@ -26,7 +26,7 @@ import org.apache.camel.model.rest.RestBindingMode; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java index 1321a2e8f9078..50850a0ec5540 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java @@ -20,7 +20,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java index f6ca37817d643..7352d2bb412e1 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java @@ -25,7 +25,7 @@ import org.apache.camel.spi.BeanIntrospection; import org.apache.camel.support.PluginHelper; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java index d650223d9a2ee..50b785a11b059 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java @@ -23,7 +23,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java index e1da3f17df741..8bc63e7d30da5 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java index 4ee523e4c77ab..33818d2b0f1f8 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java @@ -24,7 +24,7 @@ import org.apache.camel.support.PluginHelper; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java index 58a9994adeb4a..042a9c68e9eac 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java index c5669be6798c6..08e3bad5275c7 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java @@ -23,7 +23,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java index fab257909369c..1688d059db16f 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java @@ -26,7 +26,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java index e10d9c0fefc16..d9c3ba8f0dbbc 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java @@ -23,7 +23,7 @@ import org.apache.camel.http.base.HttpOperationFailedException; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java index 6009a971a47e4..c533b8846119d 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-univocity-parsers/pom.xml b/components/camel-univocity-parsers/pom.xml index 865d78b2c2b00..4e02849cbe013 100644 --- a/components/camel-univocity-parsers/pom.xml +++ b/components/camel-univocity-parsers/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java index 121c8ff7bf640..f0634519d19a3 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java @@ -20,14 +20,14 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java index fb6e4b160c286..f68bb426857a2 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java @@ -24,12 +24,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java index 14436dd61f217..6def00d7a446a 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java @@ -23,14 +23,14 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java index b9c503c042704..7c06121cb1481 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java @@ -27,12 +27,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalSpringTest.java index d04eb37b5fd54..5c001c10ad925 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalSpringTest.java @@ -20,14 +20,14 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalTest.java index 47b8189e182ba..9793e635b1452 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatMarshalTest.java @@ -24,12 +24,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalSpringTest.java index 9ea29a02e5392..fe4ff83a4e642 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalSpringTest.java @@ -23,14 +23,14 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalTest.java index 8122159c35494..9797df40dfb06 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedDataFormatUnmarshalTest.java @@ -27,12 +27,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java index 35c7d1cd5b118..8ff91a78ef0a0 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java @@ -20,14 +20,14 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java index ada56390a2e42..cb87075880199 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java @@ -24,12 +24,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java index ad0c032f177a9..1a9e5f58e0d8e 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java @@ -23,14 +23,14 @@ import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java index 984209eecf32a..505052b814794 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java @@ -27,12 +27,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.asMap; import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml index af62108a8d4c9..13c0c45045102 100644 --- a/components/camel-velocity/pom.xml +++ b/components/camel-velocity/pom.xml @@ -51,7 +51,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java index 28e28f8f3b833..89537c2b273e8 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java index 7824f23ccbbc3..975f740b50951 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; public class VelocityConcurrentTest extends CamelTestSupport { diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java index 37c8ac4e0bc60..562cb6d29e9f5 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java @@ -25,7 +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.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java index 6fd1c8f3bb10e..d3fcee004b5c7 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class VelocityDynamicTemplateTest extends CamelTestSupport { diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java index fb3bf33378c52..72fd27c373f39 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java index 35c2657e9343e..b519d38c0f331 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.velocity.tools.generic.EscapeTool; import org.junit.jupiter.api.Test; diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java index 196ef883a7320..7fa72bbec3cbd 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java @@ -19,7 +19,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java index bbb7b194d9f9f..71249e77bba84 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java index 218b6d6ab2c9f..f58c18db0ccc1 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class VelocitySetTemplateViaHeaderTest extends CamelTestSupport { diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java index 3b20381047369..f85b8844f6ed5 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java index 45d064cdf3f56..8d75a1e86a1a0 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class VelocitySupplementalContextTest extends CamelTestSupport { diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java index 4fcbc620e4d58..b96782bba4fed 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java @@ -24,10 +24,10 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertMessageBodyEquals; +import static org.apache.camel.test.junit6.TestSupport.assertMessageBodyEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java index 117091b76ad46..718c283549785 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.velocity.VelocityContext; import org.junit.jupiter.api.Test; diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java index f9c4c3efa7f2d..e70db9a600a2a 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class VelocityValuesInPropertiesTest extends CamelTestSupport { diff --git a/components/camel-vertx/camel-vertx-http/pom.xml b/components/camel-vertx/camel-vertx-http/pom.xml index 667727feed1f8..9d85dacd144c0 100644 --- a/components/camel-vertx/camel-vertx-http/pom.xml +++ b/components/camel-vertx/camel-vertx-http/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBufferConverterTest.java b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBufferConverterTest.java index 4ae33cd3fa13a..4dfd25a5661f2 100644 --- a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBufferConverterTest.java +++ b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBufferConverterTest.java @@ -23,7 +23,7 @@ import io.vertx.core.buffer.Buffer; import org.apache.camel.Exchange; import org.apache.camel.builder.ExchangeBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpConsumerTest.java b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpConsumerTest.java index 2e481adff3e8e..d9437fa104fcf 100644 --- a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpConsumerTest.java +++ b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpConsumerTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.vertx.http; import org.apache.camel.FailedToCreateConsumerException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java index 50d255fdb5aa6..96ca3b78525cc 100644 --- a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java +++ b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java @@ -25,7 +25,7 @@ import io.vertx.core.impl.VertxInternal; import io.vertx.core.impl.btc.BlockedThreadEvent; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class VertxHttpTestSupport extends CamelTestSupport { diff --git a/components/camel-vertx/camel-vertx-websocket/pom.xml b/components/camel-vertx/camel-vertx-websocket/pom.xml index b856fda3ffbef..06fcba286482d 100644 --- a/components/camel-vertx/camel-vertx-websocket/pom.xml +++ b/components/camel-vertx/camel-vertx-websocket/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java index eec662eabf108..9d18c6a59393b 100644 --- a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java +++ b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java @@ -34,7 +34,7 @@ import io.vertx.ext.web.Router; import io.vertx.ext.web.RoutingContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class VertxWebSocketTestSupport extends CamelTestSupport { diff --git a/components/camel-vertx/camel-vertx/pom.xml b/components/camel-vertx/camel-vertx/pom.xml index ddd86f8febc2e..5f3f6c8a34cd6 100644 --- a/components/camel-vertx/camel-vertx/pom.xml +++ b/components/camel-vertx/camel-vertx/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java index 99f26bf735131..ca76adcbd99eb 100644 --- a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java +++ b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.component.vertx; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBufferConverterTest.java b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBufferConverterTest.java index 2a61300762d12..514c23517b41e 100644 --- a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBufferConverterTest.java +++ b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBufferConverterTest.java @@ -22,7 +22,7 @@ import io.vertx.core.buffer.Buffer; import org.apache.camel.Exchange; import org.apache.camel.builder.ExchangeBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonArrayConverterTest.java b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonArrayConverterTest.java index 711e977bf1681..f95c897c86612 100644 --- a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonArrayConverterTest.java +++ b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonArrayConverterTest.java @@ -22,7 +22,7 @@ import io.netty.buffer.Unpooled; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonObjectConverterTest.java b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonObjectConverterTest.java index 4a878f15944bc..2e86d4b3d8cdc 100644 --- a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonObjectConverterTest.java +++ b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxJsonObjectConverterTest.java @@ -22,7 +22,7 @@ import io.netty.buffer.Unpooled; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-wasm/pom.xml b/components/camel-wasm/pom.xml index d84554f1d83b4..702f1369a3daf 100644 --- a/components/camel-wasm/pom.xml +++ b/components/camel-wasm/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml index 0949d4cef1f87..3d575de780c2d 100644 --- a/components/camel-weather/pom.xml +++ b/components/camel-weather/pom.xml @@ -60,7 +60,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java index f3fbc0f6ee45d..2bf1c52dd032f 100644 --- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java +++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java @@ -21,13 +21,13 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; import static org.junit.jupiter.api.Assertions.assertNotNull; public abstract class BaseWeatherConsumerIT extends CamelTestSupport { diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java index 824e26a53e075..11574492291c7 100644 --- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java +++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.weather; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlIT.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlIT.java index e6607677abd38..d152f98e48c58 100644 --- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlIT.java +++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlIT.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; @EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true", disabledReason = "Disabled to avoid hitting API limits") diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerIT.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerIT.java index e7109a914460d..d351805c49187 100644 --- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerIT.java +++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerIT.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; @EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true", disabledReason = "Disabled to avoid hitting API limits") diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlIT.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlIT.java index f7d3e979f1e07..8fcb91c496a0d 100644 --- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlIT.java +++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlIT.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import static org.apache.camel.test.junit5.TestSupport.assertStringContains; +import static org.apache.camel.test.junit6.TestSupport.assertStringContains; @EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true", disabledReason = "Disabled to avoid hitting API limits") diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerIT.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerIT.java index 59625aad91cb1..d84006fc0a7f3 100644 --- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerIT.java +++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerIT.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; @EnabledIfSystemProperty(named = "enable.weather.tests", matches = "true", diff --git a/components/camel-web3j/pom.xml b/components/camel-web3j/pom.xml index 29db5e376416d..d6fde97b16474 100644 --- a/components/camel-web3j/pom.xml +++ b/components/camel-web3j/pom.xml @@ -62,7 +62,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java index 581be93048817..6e8b3a2f393c8 100755 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.mockito.Mock; diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java index 382da4018c4f2..c6a56d1271b97 100644 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class Web3jIntegrationTestSupport extends CamelTestSupport { diff --git a/components/camel-webhook/pom.xml b/components/camel-webhook/pom.xml index 2a0403fea4c49..49e918515d27b 100644 --- a/components/camel-webhook/pom.xml +++ b/components/camel-webhook/pom.xml @@ -40,7 +40,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java index 71cfadffdaf5b..f33fd4e261951 100644 --- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java +++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java @@ -17,7 +17,7 @@ package org.apache.camel.component.webhook; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; public class WebhookTestBase extends CamelTestSupport { diff --git a/components/camel-whatsapp/pom.xml b/components/camel-whatsapp/pom.xml index 96f49b6421e35..649a3f592f9c6 100644 --- a/components/camel-whatsapp/pom.xml +++ b/components/camel-whatsapp/pom.xml @@ -64,7 +64,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppTestSupport.java b/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppTestSupport.java index d5dbbb5f8ac8b..a5bee68f3a22d 100644 --- a/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppTestSupport.java +++ b/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppTestSupport.java @@ -17,7 +17,7 @@ package org.apache.camel.component.whatsapp; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class WhatsAppTestSupport extends CamelTestSupport { diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml index 7e8c7164bdae6..b9221fd427ba2 100644 --- a/components/camel-wordpress/pom.xml +++ b/components/camel-wordpress/pom.xml @@ -45,7 +45,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java index b99343e02650d..464aa990b1ccc 100644 --- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java +++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.wordpress; import org.apache.camel.component.wordpress.api.model.PostSearchCriteria; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java index 04339b6eb096f..cd626bf744e57 100644 --- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java +++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java @@ -19,7 +19,7 @@ import java.io.IOException; import org.apache.camel.component.wordpress.api.test.WordpressMockServerTestSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/components/camel-workday/pom.xml b/components/camel-workday/pom.xml index 20494ad9f7157..368649a080740 100644 --- a/components/camel-workday/pom.xml +++ b/components/camel-workday/pom.xml @@ -47,7 +47,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java b/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java index acc33c4b22c45..969de6e4503e3 100644 --- a/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java +++ b/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.workday.WorkdayConfiguration; import org.apache.camel.component.workday.WorkdayEndpoint; import org.apache.camel.component.workday.producer.WorkdayCommonAPIProducer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java b/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java index 0e8a62e384b21..1a5edcbb46012 100644 --- a/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java +++ b/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.workday.WorkdayConfiguration; import org.apache.camel.component.workday.WorkdayEndpoint; import org.apache.camel.component.workday.producer.WorkdayReportProducer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml index 3a09349fd73a9..6da9ddbb1dc28 100644 --- a/components/camel-xchange/pom.xml +++ b/components/camel-xchange/pom.xml @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/XChangeTestSupport.java b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/XChangeTestSupport.java index 13bed59db9345..e9a006f1b28ed 100644 --- a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/XChangeTestSupport.java +++ b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/XChangeTestSupport.java @@ -18,7 +18,7 @@ import com.github.tomakehurst.wiremock.WireMockServer; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.knowm.xchange.Exchange; diff --git a/components/camel-xj/pom.xml b/components/camel-xj/pom.xml index 09e024c0f1406..dbb040cc225d9 100644 --- a/components/camel-xj/pom.xml +++ b/components/camel-xj/pom.xml @@ -44,7 +44,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java index c388fe5c98091..33c3ce02d2a3c 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class J2XInputStreamTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java index 0d5dc330f377a..847151ccb0944 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class J2XOutputBytesTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java index 171e1450bbdd8..49c7e86ffb47e 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class J2XOutputFileTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java index e21e517773741..e830bb63d7d9e 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class J2XOutputIdentityTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java index 28242d9747f47..499969ed3f094 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class J2XOutputStringTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java index 4667d93dcd026..fca1235b404ea 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class X2JInputStreamTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java index aff6d801a11b7..2f7cf51bd7b1d 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class X2JOutputBytesTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java index 58f1b49949c00..b05d4d1073b73 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class X2JOutputFileTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java index 5ea315b61738f..3194cac499fbd 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class X2JOutputIdentityTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java index 9eb8b6a5425f0..e9ecbb1c675a8 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class X2JOutputStringTest extends CamelTestSupport { diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml index 013e021cbc3c5..dfbf98e88fbd8 100644 --- a/components/camel-xmlsecurity/pom.xml +++ b/components/camel-xmlsecurity/pom.xml @@ -81,12 +81,12 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java index dfc0657d00283..0889b66d1847f 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java @@ -73,8 +73,8 @@ import org.apache.camel.component.xmlsecurity.util.XmlSignature2Message2MessageWithTimestampProperty; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java index 60720ae5465b5..6e68523b89f94 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java @@ -72,8 +72,8 @@ import org.apache.camel.component.xmlsecurity.util.XmlSignature2Message2MessageWithTimestampProperty; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java index 827eb112a1f61..2460a30c7fbd0 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java @@ -65,8 +65,8 @@ import org.apache.camel.spi.Registry; import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java index 87f76070bfeb2..0dfb9ce932176 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java @@ -63,8 +63,8 @@ import org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties; import org.apache.camel.component.xmlsecurity.util.TestKeystore; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.component.xmlsecurity.XmlSignatureTest.checkThrownException; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java index 6f2dab85e5c4d..f6c7301f86cde 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java @@ -99,8 +99,8 @@ import org.apache.camel.spi.Registry; import org.apache.camel.support.ExceptionHelper; import org.apache.camel.support.processor.validation.SchemaValidationException; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java index c4a6f0005f4ee..74472e81be671 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.support.jsse.KeyStoreParameters; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.xml.security.encryption.XMLCipher; import org.junit.jupiter.api.Test; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java index 99b84ef1a9f7c..27d0b813e3d8c 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java index 88ce0aa65fb80..3571a4178338e 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java @@ -18,7 +18,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java index 5bfa17136687e..e3b57d1a6e424 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.support.jsse.KeyStoreParameters; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.xml.security.encryption.XMLCipher; import org.apache.xml.security.utils.EncryptionConstants; import org.junit.jupiter.api.Test; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java index 0bb9b7833bf67..7dca6e6518f6f 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java @@ -26,10 +26,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java index fdd7c3a36cc09..842ca53072be7 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java @@ -33,7 +33,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.support.jsse.KeyStoreParameters; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.xml.security.encryption.XMLCipher; import org.junit.jupiter.api.Test; diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml index 6fbc602597fc3..9ee485a4b4955 100644 --- a/components/camel-xmpp/pom.xml +++ b/components/camel-xmpp/pom.xml @@ -78,7 +78,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java index 00392840fdad8..895449a4476ea 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java index 49a40ead86cd6..36e71a964fe3f 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.test.infra.xmpp.services.XmppServerContainer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppBaseIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppBaseIT.java index 0b869108452e2..8de4495263355 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppBaseIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppBaseIT.java @@ -24,7 +24,7 @@ import org.apache.camel.spi.Registry; import org.apache.camel.test.infra.xmpp.services.XmppService; import org.apache.camel.test.infra.xmpp.services.XmppServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java index 6655cf9d370c5..e5c863770044e 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppProducerConcurrentIT.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Github environment has trouble running the XMPP test container and/or component") diff --git a/components/camel-xslt-saxon/pom.xml b/components/camel-xslt-saxon/pom.xml index 8142026310ff6..7409be7402f37 100644 --- a/components/camel-xslt-saxon/pom.xml +++ b/components/camel-xslt-saxon/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java index 9b490bbe596dc..5b96bab67bf1d 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.xslt; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class PayloadWithDefaultNamespaceTest extends CamelTestSupport { diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java index e3c1dc7a38f60..e232d6b642d71 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java @@ -23,7 +23,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; public class SaxonInvalidXsltFileTest { diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java index 1a3dd653b35f0..76d9c0484fa29 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java @@ -28,7 +28,7 @@ import net.sf.saxon.TransformerFactoryImpl; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java index 4f7ca9bb31364..7f34e05002051 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SaxonXslIncludeEmptyHrefTest extends CamelTestSupport { diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java index 7fe7ac1704b3f..7013c02173e18 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java @@ -18,7 +18,7 @@ import org.apache.camel.component.xslt.saxon.XsltSaxonComponent; import org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java index dc63f8189441c..ed0c3e3db29db 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java @@ -26,7 +26,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java index 24c61be06face..c0ff7c73d0c8d 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.component.xslt.saxon.XsltSaxonComponent; import org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java index 248e0a83a6f88..9bee73084948b 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java @@ -19,7 +19,7 @@ import net.sf.saxon.trans.XPathException; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java index 379bf20e10322..ffced4e69924d 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java @@ -21,10 +21,10 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java index 0f7ce2f66b170..8539d3fb31195 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltXsltMessageLoggerTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltXsltMessageLoggerTest.java index 5f53afc51b790..20b447228a2d9 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltXsltMessageLoggerTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltXsltMessageLoggerTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java index 137da4d9e58c4..9b3dbae730455 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltTemplateFromHeaderOverrideEndpointUriTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltTemplateFromHeaderOverrideEndpointUriTest.java index e53f4458b496c..f4f914bc08042 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltTemplateFromHeaderOverrideEndpointUriTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltTemplateFromHeaderOverrideEndpointUriTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java index 728e76a72f030..6ae32a7f3bb3f 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java index ef3d8e5023720..6e4c183dda18a 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.xslt.extensions; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java index 2b231984a7fe7..a3925a01de448 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java @@ -30,7 +30,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class SAXSourceLogBodyTest extends CamelTestSupport { diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java index ff5c3b44b51fb..678f225455e9b 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; /** diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonJsonBodyTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonJsonBodyTest.java index 6233694e3ba4b..d5aa535967851 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonJsonBodyTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonJsonBodyTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.xmlunit.assertj3.XmlAssert; diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonTest.java index cd027e37f3253..0d953f5dd343a 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltSaxonTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-zeebe/pom.xml b/components/camel-zeebe/pom.xml index c561de3261c68..2a149cd17e90e 100644 --- a/components/camel-zeebe/pom.xml +++ b/components/camel-zeebe/pom.xml @@ -93,7 +93,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ResourceDeploymentIT.java b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ResourceDeploymentIT.java index 6d9a609398fc8..59d7d32948e4d 100644 --- a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ResourceDeploymentIT.java +++ b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ResourceDeploymentIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.zeebe.model.DeploymentRequest; import org.apache.camel.component.zeebe.model.DeploymentResponse; import org.apache.camel.component.zeebe.model.ProcessDeploymentResponse; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ThrowErrorIT.java b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ThrowErrorIT.java index 714f298e084fb..79f1acc75fb59 100644 --- a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ThrowErrorIT.java +++ b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ThrowErrorIT.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.zeebe.model.JobRequest; import org.apache.camel.component.zeebe.model.JobResponse; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java index eead2b28c0b1a..27d517028c025 100644 --- a/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java +++ b/components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ZeebeConsumerIT.java @@ -32,7 +32,7 @@ import org.apache.camel.component.zeebe.model.ProcessDeploymentResponse; import org.apache.camel.component.zeebe.model.ProcessRequest; import org.apache.camel.component.zeebe.model.ProcessResponse; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml index abef6a25e5286..43958aa1d16ed 100644 --- a/components/camel-zendesk/pom.xml +++ b/components/camel-zendesk/pom.xml @@ -55,7 +55,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java index 23d169a4a763f..36347199c12cb 100644 --- a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java +++ b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java @@ -22,8 +22,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.TestInstance; /** diff --git a/components/camel-zip-deflater/pom.xml b/components/camel-zip-deflater/pom.xml index e802dc00df3fe..450e6d7691258 100644 --- a/components/camel-zip-deflater/pom.xml +++ b/components/camel-zip-deflater/pom.xml @@ -48,7 +48,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java index c36a0f5449507..f0a318434e5a6 100644 --- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java +++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java index 3cfac362df141..9600d5aded992 100644 --- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java +++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; public class GzipDataFormatFileUnmarshalDeleteTest extends CamelTestSupport { diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java index b9a211e39736d..a58159a8d39c4 100644 --- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java +++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java index e6578005edb41..2958122c05f13 100644 --- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java +++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java index c24fafa310da5..cbb650d1fbf76 100644 --- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java +++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; public class ZipDeflaterDataFormatFileUnmarshalDeleteTest extends CamelTestSupport { diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java index 88bf0bd217eb1..6aa2d210de65a 100644 --- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java +++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java @@ -29,7 +29,7 @@ import org.apache.camel.converter.stream.InputStreamCache; import org.apache.camel.spi.DataFormat; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-zipfile/pom.xml b/components/camel-zipfile/pom.xml index db5c6035e00b5..88bd6a111ba00 100644 --- a/components/camel-zipfile/pom.xml +++ b/components/camel-zipfile/pom.xml @@ -52,7 +52,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test @@ -78,7 +78,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java index 8b24fba00b632..f07d80736973a 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java @@ -17,7 +17,7 @@ package org.apache.camel.dataformat.zipfile; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java index 4e0ca538e8474..27f4f578a4a1d 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java @@ -39,13 +39,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.stream.InputStreamCache; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; import static org.apache.camel.Exchange.FILE_NAME; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java index a53f0897c648c..249848d3390d4 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ZipFileIteratorDataFormatTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java index 2e8c12ae18da2..ff69d7db2191e 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java @@ -29,12 +29,12 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; public class ZipFileSplitAndDeleteTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorCorruptTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorCorruptTest.java index b31c257773962..a68775b2eb795 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorCorruptTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorCorruptTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ZipFileSplitIteratorCorruptTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorEmptyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorEmptyTest.java index f392eacf7f171..e4bd11f029fff 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorEmptyTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitIteratorEmptyTest.java @@ -21,7 +21,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ZipFileSplitIteratorEmptyTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java index 40b79e7bc2be4..ddf940831c197 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java @@ -29,11 +29,11 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; public class ZipFileSplitOneFileTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java index 03ad21509493a..72f28bfc1f9ee 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java @@ -20,11 +20,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; public class ZipSplitterRouteIssueTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java index 7fff60823e53d..a726be28aa5a9 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ZipSplitterRouteTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java index 48a6662f29963..15472f0ba0a82 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.ZipFileDataFormat; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ZipSplitterUseOriginalMessageTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java index 7c1cde6d0940f..afe6446672402 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java @@ -26,12 +26,12 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java index 5bf46e858bfbc..c5fab0c4745bf 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java @@ -26,12 +26,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java index 1b2845ba12069..2c913d864ef80 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java @@ -24,12 +24,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyNullBodyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyNullBodyTest.java index 1970caebbcab6..b83b7e14493cf 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyNullBodyTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyNullBodyTest.java @@ -24,12 +24,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitEmptyBodyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitEmptyBodyTest.java index 5102ccbeda09e..8e45f8d91db37 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitEmptyBodyTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitEmptyBodyTest.java @@ -18,7 +18,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class ZipAggregationStrategySplitEmptyBodyTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitTest.java index 09c38d81200f3..3422774d8715a 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitTest.java @@ -25,13 +25,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.aggregate.GroupedMessageAggregationStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.*; public class ZipAggregationStrategySplitTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java index ed67bdbaf82ae..c418d2c73ae86 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java @@ -23,12 +23,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedIssueTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedIssueTest.java index dee5cb9f0a668..f1b27e15921a0 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedIssueTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.zipfile.ZipSplitter; import org.apache.camel.spring.spi.SpringTransactionPolicy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.h2.jdbcx.JdbcDataSource; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedStreamingIssueTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedStreamingIssueTest.java index 2c20b38e0a673..b009fdfa3aec8 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedStreamingIssueTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipSplitAggregateTransactedStreamingIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.dataformat.zipfile.ZipSplitter; import org.apache.camel.spring.spi.SpringTransactionPolicy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.h2.jdbcx.JdbcDataSource; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml index 46e830144bb90..57703e1dd73a4 100644 --- a/components/camel-zookeeper-master/pom.xml +++ b/components/camel-zookeeper-master/pom.xml @@ -91,12 +91,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointIT.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointIT.java index 3a3324ec59d27..e0d58f9ea190c 100644 --- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointIT.java +++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointIT.java @@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperService; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointIT.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointIT.java index c620bd5353e40..643fc73fd5823 100644 --- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointIT.java +++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointIT.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperService; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java index 0a983519186d0..d94347c720110 100644 --- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java +++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java @@ -42,7 +42,7 @@ import org.testcontainers.containers.BindMode; import org.testcontainers.containers.SelinuxContext; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml index 7c81e601b989b..86430d3ec0286 100644 --- a/components/camel-zookeeper/pom.xml +++ b/components/camel-zookeeper/pom.xml @@ -86,12 +86,12 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java index b8636505b7425..db656b61e1b9d 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.zookeeper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/SpringZooKeeperServiceCallRouteIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/SpringZooKeeperServiceCallRouteIT.java index 0cb510cf4a503..a5441fc4824e9 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/SpringZooKeeperServiceCallRouteIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/SpringZooKeeperServiceCallRouteIT.java @@ -23,7 +23,7 @@ import org.apache.camel.test.AvailablePortFinderPropertiesFunction; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperService; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperServiceFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java index 7df0796a6c8db..37b4d1c8ffab9 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceCallRouteIT.java @@ -26,7 +26,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperService; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java index 804c78d0f76d0..1eb5096e15115 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/integration/ZooKeeperServiceRegistrationITBase.java @@ -28,7 +28,7 @@ import org.apache.camel.component.zookeeper.cloud.ZooKeeperServiceRegistry; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperContainer; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationIT.java index 1838781e15e74..8fc59cd1d84fb 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationIT.java @@ -18,7 +18,7 @@ import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java index 932798556f3a1..c902797161aa1 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java @@ -26,7 +26,7 @@ import org.apache.camel.component.zookeeper.ZooKeeperMessage; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperService; import org.apache.camel.test.infra.zookeeper.services.ZooKeeperServiceFactory; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperProducerIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperProducerIT.java index 1db6e8ecf3039..4c8efe8e52171 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperProducerIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperProducerIT.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.zookeeper.ZooKeeperMessage; import org.apache.camel.component.zookeeper.operations.GetChildrenOperation; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.data.Stat; import org.junit.jupiter.api.Test; diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml index 6bbcec5a2efe0..97bab91b700a7 100644 --- a/core/camel-main/pom.xml +++ b/core/camel-main/pom.xml @@ -80,7 +80,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java deleted file mode 120000 index d13fc1b7a1a26..0000000000000 --- a/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../../../../../../../components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java \ No newline at end of file diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java deleted file mode 120000 index fd36b19652ed6..0000000000000 --- a/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../../../../../../../components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java \ No newline at end of file diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java new file mode 120000 index 0000000000000..1f65a4bb19dc5 --- /dev/null +++ b/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java @@ -0,0 +1 @@ +../../../../../../../../../../../../../../../../../components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java \ No newline at end of file diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java new file mode 120000 index 0000000000000..8fdbb939f0f90 --- /dev/null +++ b/docs/components/modules/ROOT/examples/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java @@ -0,0 +1 @@ +../../../../../../../../../../../../../../../../../components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsJUnit5Test.java \ No newline at end of file diff --git a/dsl/camel-cli-connector/pom.xml b/dsl/camel-cli-connector/pom.xml index 926e652957a23..8bbd483a1d5ca 100644 --- a/dsl/camel-cli-connector/pom.xml +++ b/dsl/camel-cli-connector/pom.xml @@ -66,7 +66,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-componentdsl/pom.xml b/dsl/camel-componentdsl/pom.xml index b2ffd01f80eaa..31635215f56dd 100644 --- a/dsl/camel-componentdsl/pom.xml +++ b/dsl/camel-componentdsl/pom.xml @@ -114,7 +114,11 @@ camel-catalog provided - + + io.netty + netty-transport + ${netty-version} + org.junit.jupiter @@ -123,7 +127,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java index 2faaed65dfbde..07454e6bf8fcf 100644 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java +++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java @@ -395,14 +395,14 @@ default SpringRabbitmqComponentBuilder prefetchCount(int prefetchCount) { * other settings such as maximumRetryAttempts for retry are not in use. * * The option is a: - * <code>org.springframework.retry.interceptor.RetryOperationsInterceptor</code> type. + * <code>org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor</code> type. * * Group: consumer (advanced) * * @param retry the value to set * @return the dsl builder */ - default SpringRabbitmqComponentBuilder retry(org.springframework.retry.interceptor.RetryOperationsInterceptor retry) { + default SpringRabbitmqComponentBuilder retry(org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor retry) { doSetProperty("retry", retry); return this; } @@ -654,7 +654,7 @@ protected boolean setPropertyOnComponent( case "maxConcurrentConsumers": ((SpringRabbitMQComponent) component).setMaxConcurrentConsumers((java.lang.Integer) value); return true; case "messageListenerContainerType": ((SpringRabbitMQComponent) component).setMessageListenerContainerType((java.lang.String) value); return true; case "prefetchCount": ((SpringRabbitMQComponent) component).setPrefetchCount((int) value); return true; - case "retry": ((SpringRabbitMQComponent) component).setRetry((org.springframework.retry.interceptor.RetryOperationsInterceptor) value); return true; + case "retry": ((SpringRabbitMQComponent) component).setRetry((org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor) value); return true; case "shutdownTimeout": ((SpringRabbitMQComponent) component).setShutdownTimeout((long) value); return true; case "allowNullBody": ((SpringRabbitMQComponent) component).setAllowNullBody((boolean) value); return true; case "autoDeclareProducer": ((SpringRabbitMQComponent) component).setAutoDeclareProducer((boolean) value); return true; diff --git a/dsl/camel-componentdsl/src/test/java/org/apache/camel/builder/component/ComponentsBuilderFactoryTest.java b/dsl/camel-componentdsl/src/test/java/org/apache/camel/builder/component/ComponentsBuilderFactoryTest.java index 2d0fcbe543294..2f9a1ff98fca1 100644 --- a/dsl/camel-componentdsl/src/test/java/org/apache/camel/builder/component/ComponentsBuilderFactoryTest.java +++ b/dsl/camel-componentdsl/src/test/java/org/apache/camel/builder/component/ComponentsBuilderFactoryTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.kafka.KafkaConfiguration; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.timer.TimerComponent; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dsl/camel-dsl-modeline/pom.xml b/dsl/camel-dsl-modeline/pom.xml index df1a8dfaf2649..97f47428a47ee 100644 --- a/dsl/camel-dsl-modeline/pom.xml +++ b/dsl/camel-dsl-modeline/pom.xml @@ -47,7 +47,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/JBangModelineParserTest.java b/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/JBangModelineParserTest.java index 84f7c3e3c976c..256d68e3b4df8 100644 --- a/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/JBangModelineParserTest.java +++ b/dsl/camel-dsl-modeline/src/test/java/org/apache/camel/dsl/modeline/JBangModelineParserTest.java @@ -24,7 +24,7 @@ import org.apache.camel.spi.ModelineFactory; import org.apache.camel.support.PluginHelper; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml index 71fc7df5c98be..efbb812395b04 100644 --- a/dsl/camel-endpointdsl/pom.xml +++ b/dsl/camel-endpointdsl/pom.xml @@ -64,6 +64,11 @@ org.slf4j slf4j-api + + io.netty + netty-transport + ${netty-version} + org.apache.camel camel-allcomponents @@ -132,7 +137,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java index e553641b315c7..2790eb2b3c725 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java @@ -820,14 +820,14 @@ default AdvancedSpringRabbitMQEndpointConsumerBuilder prefetchCount(String prefe * other settings such as maximumRetryAttempts for retry are not in use. * * The option is a: - * org.springframework.retry.interceptor.RetryOperationsInterceptor type. + * org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor type. * * Group: consumer (advanced) * * @param retry the value to set * @return the dsl builder */ - default AdvancedSpringRabbitMQEndpointConsumerBuilder retry(org.springframework.retry.interceptor.RetryOperationsInterceptor retry) { + default AdvancedSpringRabbitMQEndpointConsumerBuilder retry(org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor retry) { doSetProperty("retry", retry); return this; } @@ -836,7 +836,7 @@ default AdvancedSpringRabbitMQEndpointConsumerBuilder retry(org.springframework. * other settings such as maximumRetryAttempts for retry are not in use. * * The option will be converted to a - * org.springframework.retry.interceptor.RetryOperationsInterceptor type. + * org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor type. * * Group: consumer (advanced) * diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java index 17452c618ee6b..63deed02f5caa 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.ThreadLocalRandom; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public abstract class BaseEndpointDslTest extends CamelTestSupport { diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CamelContextReloadStrategyTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CamelContextReloadStrategyTest.java index 3e537a8496511..01ffa82555115 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CamelContextReloadStrategyTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CamelContextReloadStrategyTest.java @@ -26,7 +26,7 @@ import org.apache.camel.support.DefaultContextReloadStrategy; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakManualTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakManualTest.java index c0a7ec7e53b6b..c382b647be59a 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakManualTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakManualTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; /** * Unit test to test CAMEL-1652 diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java index 32f386a519f71..147ff266e3b2a 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java index bc000ea8ff1c2..7b0d202d6fe32 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java @@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; public class FileDelayTest extends BaseEndpointDslTest { private static final String TEST_DATA_DIR = BaseEndpointDslTest.generateUniquePath(BaseEndpointDslTest.class); diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java index 137b93318ba8b..2c01f2c79437a 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.builder.endpoint.dsl.HttpEndpointBuilderFactory; import org.apache.camel.component.http.HttpEndpoint; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsTest.java index 26888c861ee13..5a60164d7ec93 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.http.HttpEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java index ae6fc1af61d65..78dc98ca92a8f 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.paho.PahoEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollDynamicFileNameTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollDynamicFileNameTest.java index 73dfc7b837e15..d11923ee3f298 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollDynamicFileNameTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollDynamicFileNameTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; public class PollDynamicFileNameTest extends BaseEndpointDslTest { diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollEnrichFilterTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollEnrichFilterTest.java index 53b1dd547e1fd..f7aad73d4f6a3 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollEnrichFilterTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PollEnrichFilterTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; public class PollEnrichFilterTest extends BaseEndpointDslTest { diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java index 52b5f67a26bb5..3b670754d0231 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.quartz.QuartzEndpoint; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java index 2b68d1039e215..f44bdf8bf3712 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.SimpleDriverDataSource; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.*; public class SqlTest extends BaseEndpointDslTest { diff --git a/dsl/camel-java-joor-dsl/pom.xml b/dsl/camel-java-joor-dsl/pom.xml index 13e90c44698a1..d1e698c1d167c 100644 --- a/dsl/camel-java-joor-dsl/pom.xml +++ b/dsl/camel-java-joor-dsl/pom.xml @@ -110,7 +110,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml index 4f3941d93e521..9182727b88e1e 100644 --- a/dsl/camel-jbang/camel-jbang-core/pom.xml +++ b/dsl/camel-jbang/camel-jbang-core/pom.xml @@ -155,7 +155,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl index 0fd31ab9a1c69..e351b66e71164 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl +++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl @@ -59,7 +59,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl index f3cff0c28e009..2e75c16b3c0c5 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl +++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl @@ -61,7 +61,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl index c1c60b156a4d2..1c97a49de1c5b 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl +++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-kubernetes-pom.tmpl @@ -63,7 +63,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl index 80c4ddd72f75c..558d16ab578ad 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl +++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl @@ -60,7 +60,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/main-pom.xml b/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/main-pom.xml index dc5db435c389e..f650dae2fa6fd 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/main-pom.xml +++ b/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/main-pom.xml @@ -107,7 +107,7 @@ org.apache.camel - camel-test-main-junit5 + camel-test-main-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/springboot-pom.xml b/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/springboot-pom.xml index 8876a5a65837e..8ac64f5a4cdbd 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/springboot-pom.xml +++ b/dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/springboot-pom.xml @@ -90,7 +90,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-it/pom.xml b/dsl/camel-jbang/camel-jbang-it/pom.xml index 6d926c948f54a..3e27f53b82194 100644 --- a/dsl/camel-jbang/camel-jbang-it/pom.xml +++ b/dsl/camel-jbang/camel-jbang-it/pom.xml @@ -208,7 +208,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml index 941dac2a819fc..2e3ad9a741d49 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml +++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml @@ -239,7 +239,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-jbang/camel-jbang-plugin-test/pom.xml b/dsl/camel-jbang/camel-jbang-plugin-test/pom.xml index 00b60f9f54474..954189cfe650b 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-test/pom.xml +++ b/dsl/camel-jbang/camel-jbang-plugin-test/pom.xml @@ -56,7 +56,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-xml-io-dsl/pom.xml b/dsl/camel-xml-io-dsl/pom.xml index 3b1d1e1252720..ad4661735350f 100644 --- a/dsl/camel-xml-io-dsl/pom.xml +++ b/dsl/camel-xml-io-dsl/pom.xml @@ -132,7 +132,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java index a10246d1f59c7..d10042d50da1e 100644 --- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java +++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java @@ -26,14 +26,14 @@ import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; import org.apache.camel.support.RouteWatcherReloadStrategy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.FileUtil; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/dsl/camel-xml-jaxb-dsl-test/definition/pom.xml b/dsl/camel-xml-jaxb-dsl-test/definition/pom.xml index c132bd483cee4..35db0b492398f 100644 --- a/dsl/camel-xml-jaxb-dsl-test/definition/pom.xml +++ b/dsl/camel-xml-jaxb-dsl-test/definition/pom.xml @@ -114,7 +114,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-xml-jaxb-dsl-test/spring/pom.xml b/dsl/camel-xml-jaxb-dsl-test/spring/pom.xml index 670eb9aebd9a3..a1f8569d4ed7d 100644 --- a/dsl/camel-xml-jaxb-dsl-test/spring/pom.xml +++ b/dsl/camel-xml-jaxb-dsl-test/spring/pom.xml @@ -114,7 +114,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl/pom.xml index 3e1a3c799542c..7b47001b853f2 100644 --- a/dsl/camel-xml-jaxb-dsl/pom.xml +++ b/dsl/camel-xml-jaxb-dsl/pom.xml @@ -107,7 +107,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml index 0610a324838bb..5e14e5d2f447e 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml @@ -250,7 +250,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/yaml/dsl/kamelet/AwsRawSecretTest.java b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/yaml/dsl/kamelet/AwsRawSecretTest.java index 357a1eb25c839..c095b60c17487 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/yaml/dsl/kamelet/AwsRawSecretTest.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/yaml/dsl/kamelet/AwsRawSecretTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.s3.AWS2S3Endpoint; import org.apache.camel.impl.engine.DefaultSupervisingRouteController; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/parent/pom.xml b/parent/pom.xml index 759afa2797dbf..e3229f0125a8e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -416,7 +416,7 @@ 5.13.1.Final 0.4.0 6.0.2 - 4.1.130.Final + 4.2.9.Final 2.0.5 1.5.9 10.7 @@ -474,8 +474,8 @@ 1.3.2 3.52.0 2.3.0 - 5.5.6 - 2.31.0.Final + 6.0.0 + 2.30.3.Final 4.1.2 5.3.2 2.1.0 @@ -502,16 +502,16 @@ 1.9.5_1 2.4-groovy-4.0 1.1.2 - 4.3.0 - 5.2.4 - 3.5.10 - 3.5.5 - 3.3.5 - 3.2.0 - 6.2.15 - 3.2.8 - 6.5.7 - 4.1.2 + 5.0.1 + 6.0.2 + 4.0.2 + 4.0.2 + 4.0.1 + 4.0.0 + 7.0.3 + 4.0.2 + 7.0.2 + 5.0.0 3.0.0 3.14.9 5.3.2 @@ -3210,7 +3210,7 @@ org.junit junit-bom - ${junit-jupiter-version} + ${junit6-jupiter-version} pom import diff --git a/test-infra/camel-test-infra-artemis/pom.xml b/test-infra/camel-test-infra-artemis/pom.xml index c0d4e5cf7e67e..a930e2ed93f1e 100644 --- a/test-infra/camel-test-infra-artemis/pom.xml +++ b/test-infra/camel-test-infra-artemis/pom.xml @@ -76,7 +76,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 diff --git a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java index 57652d6f15d15..127f562258e0f 100644 --- a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java +++ b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java @@ -45,7 +45,7 @@ protected void addToStore(ExtensionContext extensionContext) { final ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL); LOG.debug("Using store: {}", store); - store.getOrComputeIfAbsent(name, this::doInitializeService); + store.computeIfAbsent(name, this::doInitializeService); Runtime.getRuntime().addShutdownHook(new Thread(service::shutdown)); } diff --git a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java index 41f9e2ea32dc0..7ee93fb4c7a8d 100644 --- a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java +++ b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java @@ -23,7 +23,7 @@ public class FhirLocalSingletonContainerService extends FhirLocalContainerServic @Override public void beforeAll(ExtensionContext extensionContext) { - extensionContext.getRoot().getStore(ExtensionContext.Namespace.GLOBAL).getOrComputeIfAbsent("fhir", s -> { + extensionContext.getRoot().getStore(ExtensionContext.Namespace.GLOBAL).computeIfAbsent("fhir", s -> { super.initialize(); return this; }); diff --git a/test-infra/camel-test-infra-openai-mock/pom.xml b/test-infra/camel-test-infra-openai-mock/pom.xml index 40e071db11dfe..f233fe6b4a35d 100644 --- a/test-infra/camel-test-infra-openai-mock/pom.xml +++ b/test-infra/camel-test-infra-openai-mock/pom.xml @@ -44,7 +44,7 @@ org.junit.jupiter junit-jupiter-api - ${junit-jupiter-version} + ${junit6-jupiter-version} @@ -61,7 +61,7 @@ org.junit.jupiter junit-jupiter-engine - ${junit-jupiter-version} + ${junit6-jupiter-version} test diff --git a/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties b/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties index d1bf8c9d92129..f4e44e0c8d035 100644 --- a/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties +++ b/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties @@ -14,6 +14,6 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -rabbitmq.container=mirror.gcr.io/rabbitmq:4.1.2-management +rabbitmq.container=mirror.gcr.io/rabbitmq:4.2.2-management rabbitmq.container.version.include=management rabbitmq.container.version.exclude=alpine diff --git a/test-infra/camel-test-infra-smb/pom.xml b/test-infra/camel-test-infra-smb/pom.xml index 3dba835faff19..a2361c62c3805 100644 --- a/test-infra/camel-test-infra-smb/pom.xml +++ b/test-infra/camel-test-infra-smb/pom.xml @@ -53,7 +53,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index e504de0222630..e3d0c4c72df0a 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -247,7 +247,7 @@ org.apache.camel - camel-test-spring-junit5 + camel-test-spring-junit6 test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java index 5e9c274d312f2..eb3abcd251397 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java @@ -22,7 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CatalogCamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.tooling.model.BaseOptionModel; import org.apache.camel.tooling.model.DataFormatModel; import org.apache.camel.tooling.model.DataFormatModel.DataFormatOptionModel; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DirectComponentConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DirectComponentConfigurationAndDocumentationTest.java index 7e3c9b9954ff4..9600311d53ca4 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DirectComponentConfigurationAndDocumentationTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DirectComponentConfigurationAndDocumentationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CatalogCamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java index 18812a6df8d22..df9140f1a46c2 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CatalogCamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/GroovyLanguageConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/GroovyLanguageConfigurationAndDocumentationTest.java index d41e85bcee8f9..febeb063cca64 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/GroovyLanguageConfigurationAndDocumentationTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/GroovyLanguageConfigurationAndDocumentationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CatalogCamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java index 77fe60a42b088..918f70b34395f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CatalogCamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/StringDataFormatConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/StringDataFormatConfigurationAndDocumentationTest.java index 43c086d4c24a4..e6226ff94e366 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/StringDataFormatConfigurationAndDocumentationTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/StringDataFormatConfigurationAndDocumentationTest.java @@ -19,7 +19,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CatalogCamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java index 0f4dc1d527018..16f1f97420f5a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.FtpServiceExtension; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java index 44d748dcb127a..6fdab8b63bccd 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.FtpServiceExtension; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java index f33be9fc8b170..383de7de85090 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.FtpServiceExtension; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.ftpserver.FtpServer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java index 1cf98815b1d23..00a0d4d1ff27b 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java @@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.FtpServiceExtension; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.ftpserver.FtpServer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java index d1381e5b098ae..e94891250172a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java @@ -21,8 +21,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.itest.utils.extensions.GreeterServiceExtension; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java index 1444eeb53b057..1918ac5918ad7 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java index 842582b36b00a..2e3cdbbc556b2 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java index 585bc1060b713..2e088b1951822 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java @@ -20,7 +20,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java index 29c4b644ec9fe..79d38a511ef66 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.itest.issues; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.apache.xbean.spring.context.ClassPathXmlApplicationContext; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/InterceptFromAndStrategyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/InterceptFromAndStrategyTest.java index 6987184516566..11348ddd40469 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/InterceptFromAndStrategyTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/InterceptFromAndStrategyTest.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; public class InterceptFromAndStrategyTest extends CamelTestSupport { diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java index abdfb485037e0..c6317922be05b 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/RemoveEndpointsTest.java @@ -24,7 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java index 87e71474f1686..fe5ae05a52fdb 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java index 9b57c34f48419..24af88e28e6ed 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java @@ -19,7 +19,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.apache.camel.language.groovy.GroovyLanguage.groovy; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java index 1beff72d09175..4bd195a35d9eb 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java index 037da37275222..be72953eb7d2f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java @@ -21,8 +21,8 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.TestSupport; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.junit6.TestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java index 1a8be6507e8a5..9d62bdeccd1e1 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java index 894717b85d920..f69880d1e84a1 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.ResourceHelper; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java index 391f1aef349c9..54b0e5dbc19b8 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java @@ -24,7 +24,7 @@ import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java index beeddd9d05b25..91ba8cda10a18 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java index 520a4188b565a..9a93a8a86f3da 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java @@ -22,7 +22,7 @@ import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java index 0e1fcebff6d1c..45523c8bb331f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java @@ -23,7 +23,7 @@ import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java index c7e93adc78722..526213ce6ffde 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java @@ -24,12 +24,12 @@ import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.apache.camel.test.junit5.TestSupport.body; +import static org.apache.camel.test.junit6.TestSupport.body; @Timeout(30) public class JmsJettyAsyncTest extends CamelTestSupport { diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java index 0e444ac9dac69..d7716126066a4 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java @@ -30,7 +30,7 @@ import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.Registry; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyManualTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyManualTest.java index e01a908e92194..ebcd19743eed7 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyManualTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyManualTest.java @@ -23,7 +23,7 @@ import org.apache.camel.ShutdownRunningTask; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.routepolicy.quartz.CronScheduledRoutePolicy; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.FtpServerFactory; import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory; @@ -35,8 +35,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; @Disabled("Manual test") public class FtpCronScheduledRoutePolicyManualTest extends CamelTestSupport { diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java index d48fdd3c3f5ac..934256d2169f2 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.itest.security; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.condition.EnabledIf; import org.springframework.test.context.ContextConfiguration; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java index 995aaeff783a0..4f43eeb609629 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java @@ -28,7 +28,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.test.AvailablePort; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java index ccd5e8b2661f6..b117146863036 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java @@ -26,7 +26,7 @@ import org.apache.camel.component.shiro.security.ShiroSecurityPolicy; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java index 3dc42e8cf368d..7bcb5812016d6 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; -import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit6.CamelSpringTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java index ae093d09f1e18..2e2207b2bda62 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java @@ -26,7 +26,7 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.apache.camel.test.junit6.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java index 8aecd4c433c34..bdc26886264d9 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.test.context.ContextConfiguration; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java index 018c09915324b..bdaa5d80cecf9 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java index c4532c5b30689..4d3257b7c1088 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java @@ -23,7 +23,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java index 339e5e890e2cf..338a43a35fd71 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.utils.extensions.JmsServiceExtension; -import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit6.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.test.context.ContextConfiguration; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/ValidatorSchemaImportTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/ValidatorSchemaImportTest.java index 8429285971295..5cf0ec6d38528 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/ValidatorSchemaImportTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/ValidatorSchemaImportTest.java @@ -19,7 +19,7 @@ import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tests/camel-streamcaching-test/pom.xml b/tests/camel-streamcaching-test/pom.xml index f03b21afebeea..d2dd984e76bb0 100644 --- a/tests/camel-streamcaching-test/pom.xml +++ b/tests/camel-streamcaching-test/pom.xml @@ -40,7 +40,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/tests/camel-streamcaching-test/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamDirectMemoryTest.java b/tests/camel-streamcaching-test/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamDirectMemoryTest.java index 5636f391811bf..a0867cf39f988 100644 --- a/tests/camel-streamcaching-test/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamDirectMemoryTest.java +++ b/tests/camel-streamcaching-test/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamDirectMemoryTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 408fc85c7517c..a6b7b3b7a33e5 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -120,7 +120,7 @@ org.apache.camel - camel-test-junit5 + camel-test-junit6 test diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java index 7b0cf1eda2910..09923e9c096be 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java @@ -19,7 +19,7 @@ import java.util.Map; import org.apache.camel.CamelExecutionException; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; /** * Dummy TestSupport class. diff --git a/tooling/maven/camel-repackager-maven-plugin/src/main/java/org/apache/camel/maven/RepackageMojo.java b/tooling/maven/camel-repackager-maven-plugin/src/main/java/org/apache/camel/maven/RepackageMojo.java index 4dad4468f106f..3ffeec345ba47 100644 --- a/tooling/maven/camel-repackager-maven-plugin/src/main/java/org/apache/camel/maven/RepackageMojo.java +++ b/tooling/maven/camel-repackager-maven-plugin/src/main/java/org/apache/camel/maven/RepackageMojo.java @@ -29,8 +29,6 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.springframework.boot.loader.tools.DefaultLaunchScript; -import org.springframework.boot.loader.tools.LaunchScript; import org.springframework.boot.loader.tools.Library; import org.springframework.boot.loader.tools.LibraryCallback; import org.springframework.boot.loader.tools.LibraryScope; @@ -95,10 +93,8 @@ public void execute() throws MojoExecutionException, MojoFailureException { repackager.setBackupSource(backupSource); repackager.setMainClass(mainClass); - LaunchScript launchScript = new DefaultLaunchScript(null, null); - File targetFile = getTargetFile(); - repackager.repackage(targetFile, this::getLibraries, launchScript); + repackager.repackage(targetFile, this::getLibraries); getLog().info("Successfully created self-executing JAR: " + targetFile);