This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit f605090e752aef4675bd49c0e7ea7c0d3732fef9 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Mon Aug 17 11:58:13 2020 +0200 [CAMEL-11807] Fix remaining references to org.junit.runners.Parameterized --- .../test/java/org/apache/camel/component/rest/openapi/HttpsTest.java | 2 -- .../apache/camel/component/rest/openapi/RestOpenApiComponentTest.java | 2 -- .../apache/camel/component/rest/openapi/RestOpenApiComponentV3Test.java | 2 -- .../test/java/org/apache/camel/component/rest/swagger/HttpsTest.java | 2 -- .../camel/component/salesforce/CompositeApiBatchIntegrationTest.java | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java index 5b01a49..7e00aca 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java @@ -51,7 +51,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.junit.runners.Parameterized.Parameters; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; @@ -142,7 +141,6 @@ public abstract class HttpsTest extends CamelTestSupport { }; } - @Parameters(name = "component = {0}") public static Iterable<String> knownProducers() { final List<String> producers = new ArrayList<>(Arrays.asList(RestEndpoint.DEFAULT_REST_PRODUCER_COMPONENTS)); diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentTest.java index 761bf01..579fcde 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentTest.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentTest.java @@ -41,7 +41,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.junit.runners.Parameterized.Parameters; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; @@ -236,7 +235,6 @@ public class RestOpenApiComponentTest extends CamelTestSupport { }; } - @Parameters(name = "component = {0}") public static Iterable<String> knownProducers() { return Arrays.asList(RestEndpoint.DEFAULT_REST_PRODUCER_COMPONENTS); } diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentV3Test.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentV3Test.java index e5298c7..247fa00 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentV3Test.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentV3Test.java @@ -41,7 +41,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.junit.runners.Parameterized.Parameters; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; @@ -237,7 +236,6 @@ public class RestOpenApiComponentV3Test extends CamelTestSupport { }; } - @Parameters(name = "component = {0}") public static Iterable<String> knownProducers() { return Arrays.asList(RestEndpoint.DEFAULT_REST_PRODUCER_COMPONENTS); } diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java index dcaf0f0..bccdaa7 100644 --- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java +++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java @@ -51,7 +51,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.junit.runners.Parameterized.Parameters; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; @@ -158,7 +157,6 @@ public abstract class HttpsTest extends CamelTestSupport { }; } - @Parameters(name = "component = {0}") public static Iterable<String> knownProducers() { final List<String> producers = new ArrayList<>(Arrays.asList(RestEndpoint.DEFAULT_REST_PRODUCER_COMPONENTS)); return producers; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java index 0c8fe13..0b491d5 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java @@ -37,10 +37,10 @@ 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.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.runners.Parameterized.Parameters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse;