This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new fcac62a CAMEL-16184: Migrate huawei tests from junit 4.x to 5.x fcac62a is described below commit fcac62aac596adde0bd607035eb4f2d1fd6c8cff Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Sep 2 16:07:07 2021 +0200 CAMEL-16184: Migrate huawei tests from junit 4.x to 5.x --- components/camel-huawei/camel-huaweicloud-dms/pom.xml | 8 +------- .../huaweicloud/dms/CreateInstanceJsonFunctionalTest.java | 11 +++++++---- .../component/huaweicloud/dms/CreateInstanceJsonTest.java | 6 ++++-- .../huaweicloud/dms/CreateInstanceKafkaFunctionalTest1.java | 11 +++++++---- .../huaweicloud/dms/CreateInstanceKafkaFunctionalTest2.java | 11 +++++++---- .../component/huaweicloud/dms/CreateInstanceKafkaTest1.java | 6 ++++-- .../component/huaweicloud/dms/CreateInstanceKafkaTest2.java | 6 ++++-- .../huaweicloud/dms/CreateInstancePojoFunctionalTest.java | 11 +++++++---- .../component/huaweicloud/dms/CreateInstancePojoTest.java | 6 ++++-- .../huaweicloud/dms/CreateInstanceRmqFunctionalTest1.java | 11 +++++++---- .../huaweicloud/dms/CreateInstanceRmqFunctionalTest2.java | 11 +++++++---- .../component/huaweicloud/dms/CreateInstanceRmqTest1.java | 6 ++++-- .../component/huaweicloud/dms/CreateInstanceRmqTest2.java | 6 ++++-- .../huaweicloud/dms/DeleteInstanceFunctionalTest.java | 10 ++++++---- .../camel/component/huaweicloud/dms/DeleteInstanceTest.java | 6 ++++-- .../huaweicloud/dms/ListInstancesFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/dms/ListInstancesTest.java | 6 ++++-- .../huaweicloud/dms/QueryInstanceFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/dms/QueryInstanceTest.java | 6 ++++-- .../huaweicloud/dms/UpdateInstanceJsonFunctionalTest.java | 10 ++++++---- .../component/huaweicloud/dms/UpdateInstanceJsonTest.java | 6 ++++-- .../huaweicloud/dms/UpdateInstancePojoFunctionalTest.java | 10 ++++++---- .../component/huaweicloud/dms/UpdateInstancePojoTest.java | 6 ++++-- .../huaweicloud/dms/constants/DMSConstantsTest.java | 2 +- .../huaweicloud/dms/constants/DMSOperationsTest.java | 2 +- .../huaweicloud/dms/constants/DMSPropertiesTest.java | 2 +- .../camel-huawei/camel-huaweicloud-functiongraph/pom.xml | 8 +------- .../apache/camel/InvokeFunctionCombinedFunctionalTest.java | 11 +++++++---- .../java/org/apache/camel/InvokeFunctionCombinedTest.java | 8 ++++++-- .../apache/camel/InvokeFunctionEndpointFunctionalTest.java | 11 +++++++---- .../java/org/apache/camel/InvokeFunctionEndpointTest.java | 8 ++++++-- .../apache/camel/InvokeFunctionExchangeFunctionalTest.java | 11 +++++++---- .../java/org/apache/camel/InvokeFunctionExchangeTest.java | 8 ++++++-- .../java/org/apache/camel/InvokeFunctionFunctionalTest.java | 11 +++++++---- .../apache/camel/InvokeFunctionServiceKeyFunctionalTest.java | 11 +++++++---- .../java/org/apache/camel/InvokeFunctionServiceKeyTest.java | 8 ++++++-- .../src/test/java/org/apache/camel/InvokeFunctionTest.java | 8 ++++++-- .../apache/camel/constants/FunctionGraphConstantsTest.java | 2 +- .../apache/camel/constants/FunctionGraphOperationsTest.java | 2 +- .../apache/camel/constants/FunctionGraphPropertiesTest.java | 2 +- components/camel-huawei/camel-huaweicloud-iam/pom.xml | 8 +------- .../huaweicloud/iam/GetGroupUsersFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/iam/GetGroupUsersTest.java | 6 ++++-- .../component/huaweicloud/iam/GetUserFunctionalTest.java | 11 +++++++---- .../apache/camel/component/huaweicloud/iam/GetUserTest.java | 6 ++++-- .../component/huaweicloud/iam/ListGroupsFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/iam/ListGroupsTest.java | 6 ++++-- .../component/huaweicloud/iam/ListUsersFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/iam/ListUsersTest.java | 6 ++++-- .../component/huaweicloud/iam/UpdateGroupFunctionalTest.java | 11 +++++++---- .../huaweicloud/iam/UpdateGroupJsonFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/iam/UpdateGroupJsonTest.java | 6 ++++-- .../camel/component/huaweicloud/iam/UpdateGroupTest.java | 6 ++++-- .../component/huaweicloud/iam/UpdateUserFunctionalTest.java | 11 +++++++---- .../huaweicloud/iam/UpdateUserJsonFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/iam/UpdateUserJsonTest.java | 6 ++++-- .../camel/component/huaweicloud/iam/UpdateUserTest.java | 6 ++++-- .../huaweicloud/iam/constants/IAMOperationsTest.java | 2 +- .../huaweicloud/iam/constants/IAMPropertiesTest.java | 2 +- components/camel-huawei/camel-huaweicloud-obs/pom.xml | 8 +------- .../huaweicloud/obs/BucketMetadataFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/obs/BucketMetadataTest.java | 6 ++++-- .../component/huaweicloud/obs/CheckBucketFunctionalTest.java | 10 ++++++---- .../camel/component/huaweicloud/obs/CheckBucketTest.java | 6 ++++-- .../huaweicloud/obs/CreateBucketFunctionalTest.java | 11 +++++++---- .../huaweicloud/obs/CreateBucketJsonFunctionalTest.java | 11 +++++++---- .../component/huaweicloud/obs/CreateBucketJsonTest.java | 6 ++++-- .../huaweicloud/obs/CreateBucketPojoFunctionalTest.java | 11 +++++++---- .../component/huaweicloud/obs/CreateBucketPojoTest.java | 6 ++++-- .../camel/component/huaweicloud/obs/CreateBucketTest.java | 6 ++++-- .../huaweicloud/obs/DeleteBucketFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/obs/DeleteBucketTest.java | 6 ++++-- .../huaweicloud/obs/DownloadDeleteFunctionalTest.java | 11 +++++++---- .../component/huaweicloud/obs/DownloadFunctionalTest.java | 11 +++++++---- .../huaweicloud/obs/DownloadMoveExistsFunctionalTest.java | 11 +++++++---- .../huaweicloud/obs/DownloadMoveFunctionalTest.java | 11 +++++++---- .../huaweicloud/obs/DownloadSingleFunctionalTest.java | 12 ++++++++---- .../component/huaweicloud/obs/ListBucketsFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/obs/ListBucketsTest.java | 6 ++++-- .../component/huaweicloud/obs/ListObjectsFunctionalTest.java | 11 +++++++---- .../huaweicloud/obs/ListObjectsJsonFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/obs/ListObjectsJsonTest.java | 6 ++++-- .../camel/component/huaweicloud/obs/ListObjectsMaxTest.java | 6 ++++-- .../huaweicloud/obs/ListObjectsPojoFunctionalTest.java | 11 +++++++---- .../camel/component/huaweicloud/obs/ListObjectsPojoTest.java | 6 ++++-- .../camel/component/huaweicloud/obs/ListObjectsTest.java | 6 ++++-- .../huaweicloud/obs/constants/OBSConstantsTest.java | 2 +- .../component/huaweicloud/obs/constants/OBSHeadersTest.java | 2 +- .../huaweicloud/obs/constants/OBSOperationsTest.java | 2 +- .../huaweicloud/obs/constants/OBSPropertiesTest.java | 2 +- .../component/huaweicloud/obs/models/OBSRegionTest.java | 2 +- components/camel-huawei/camel-huaweicloud-smn/pom.xml | 10 ---------- 92 files changed, 437 insertions(+), 277 deletions(-) diff --git a/components/camel-huawei/camel-huaweicloud-dms/pom.xml b/components/camel-huawei/camel-huaweicloud-dms/pom.xml index 88a91fb..3b83c37 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-dms/pom.xml @@ -66,14 +66,8 @@ <!-- testing --> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit-jupiter-version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> 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 c9a641a..afd4cb1 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,9 +21,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateInstanceJsonFunctionalTest extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -57,7 +60,7 @@ public class CreateInstanceJsonFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); 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 1f4ccd2..ef8faf6 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,10 +23,12 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateInstanceJsonTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest1.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest1.java index f4164e8..b894843 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest1.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest1.java @@ -24,9 +24,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateInstanceKafkaFunctionalTest1 extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -93,7 +96,7 @@ public class CreateInstanceKafkaFunctionalTest1 extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest2.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest2.java index a355bb0..b0e3d4b 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest2.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaFunctionalTest2.java @@ -25,9 +25,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateInstanceKafkaFunctionalTest2 extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -93,7 +96,7 @@ public class CreateInstanceKafkaFunctionalTest2 extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest1.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest1.java index 27d4f87..51ecba7 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest1.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest1.java @@ -26,10 +26,12 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateInstanceKafkaTest1 extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest2.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest2.java index 0b7f8d0..65e8670 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest2.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceKafkaTest2.java @@ -27,10 +27,12 @@ import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateInstanceKafkaTest2 extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 9ba92a4..860fd2e 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,9 +25,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateInstancePojoFunctionalTest extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -61,7 +64,7 @@ public class CreateInstancePojoFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); 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 2f63f87..a018395 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,10 +27,12 @@ import org.apache.camel.component.huaweicloud.dms.models.CreateInstanceRequest; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateInstancePojoTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest1.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest1.java index 489135e..bb6b72b 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest1.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest1.java @@ -24,9 +24,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateInstanceRmqFunctionalTest1 extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -89,7 +92,7 @@ public class CreateInstanceRmqFunctionalTest1 extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest2.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest2.java index d2d2785..ce8d574 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest2.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqFunctionalTest2.java @@ -25,9 +25,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateInstanceRmqFunctionalTest2 extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -89,7 +92,7 @@ public class CreateInstanceRmqFunctionalTest2 extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest1.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest1.java index d974182..2d10e4f 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest1.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest1.java @@ -26,10 +26,12 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateInstanceRmqTest1 extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest2.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest2.java index f62db7a..a5b4ec2 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest2.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/CreateInstanceRmqTest2.java @@ -27,10 +27,12 @@ import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateInstanceRmqTest2 extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 681a4f7..4ed6e69 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,9 +22,11 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class DeleteInstanceFunctionalTest extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -61,7 +63,7 @@ public class DeleteInstanceFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); 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 0d01579..484b817 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,10 +24,12 @@ import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class DeleteInstanceTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 bfabaa4..a43496f 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,9 +19,12 @@ package org.apache.camel.component.huaweicloud.dms; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ListInstancesFunctionalTest extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -55,7 +58,7 @@ public class ListInstancesFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); 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 5eb41d4..da6d8a5 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,10 +27,12 @@ import org.apache.camel.component.huaweicloud.dms.models.DmsInstance; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListInstancesTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 1d8bfc4..3e7fc75 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,9 +21,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class QueryInstanceFunctionalTest extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -59,7 +62,7 @@ public class QueryInstanceFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); 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 422fa83..0aa84cd 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,10 +24,12 @@ import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class QueryInstanceTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 dba40c9..8b0c3a0 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,9 +22,11 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class UpdateInstanceJsonFunctionalTest extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -60,7 +62,7 @@ public class UpdateInstanceJsonFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); 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 ab02fbb..85043b0 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,10 +24,12 @@ import org.apache.camel.component.huaweicloud.dms.constants.DMSProperties; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class UpdateInstanceJsonTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 f07b25c..0539267 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,9 +23,11 @@ import org.apache.camel.component.huaweicloud.common.models.ServiceKeys; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class UpdateInstancePojoFunctionalTest extends CamelTestSupport { private static final String AUTHENTICATION_KEY = "replace_this_with_authentication_key"; @@ -61,7 +63,7 @@ public class UpdateInstancePojoFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testOperation() throws Exception { MockEndpoint mock = getMockEndpoint("mock:operation_result"); 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 780969c..69d7664 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,10 +25,12 @@ import org.apache.camel.component.huaweicloud.dms.models.UpdateInstanceRequest; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class UpdateInstancePojoTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSConstantsTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSConstantsTest.java index d4ade66..30063d0 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSConstantsTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSConstantsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.dms.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSOperationsTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSOperationsTest.java index b8e7e55..46336f8 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSOperationsTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSOperationsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.dms.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSPropertiesTest.java b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSPropertiesTest.java index 2a87d5f..9c9636a 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSPropertiesTest.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/test/java/org/apache/camel/component/huaweicloud/dms/constants/DMSPropertiesTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.dms.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml b/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml index 7ef56d3..bd08b1e 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/pom.xml @@ -70,14 +70,8 @@ <!-- testing --> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit-jupiter-version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> </dependencies> 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 95f5fc2..6ae319e 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,12 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionCombinedFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionCombinedFunctionalTest.class.getName()); @@ -66,7 +69,7 @@ public class InvokeFunctionCombinedFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testInvokeFunction() throws Exception { MockEndpoint mock = getMockEndpoint("mock:invoke_function_result"); 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 a036485..8a0d120 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,11 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionCombinedTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionTest.class.getName()); 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 7771d6b..af37ce8 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,12 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionEndpointFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionEndpointFunctionalTest.class.getName()); @@ -62,7 +65,7 @@ public class InvokeFunctionEndpointFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testInvokeFunction() throws Exception { MockEndpoint mock = getMockEndpoint("mock:invoke_function_result"); 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 b8d0d70..ff9dfce 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,11 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionEndpointTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionTest.class.getName()); 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 3fe71c8..bd6ae1d 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,12 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionExchangeFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionExchangeFunctionalTest.class.getName()); @@ -63,7 +66,7 @@ public class InvokeFunctionExchangeFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testInvokeFunction() throws Exception { MockEndpoint mock = getMockEndpoint("mock:invoke_function_result"); 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 58b40da..a03a847 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,11 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionExchangeTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionTest.class.getName()); 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 4343fa9..3c4a80f 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,12 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionFunctionalTest.class.getName()); @@ -62,7 +65,7 @@ public class InvokeFunctionFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testInvokeFunction() throws Exception { MockEndpoint mock = getMockEndpoint("mock:invoke_function_result"); 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 d88c043..99a7029 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,12 +20,15 @@ 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.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionServiceKeyFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionServiceKeyFunctionalTest.class.getName()); @@ -65,7 +68,7 @@ public class InvokeFunctionServiceKeyFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testInvokeFunction() throws Exception { MockEndpoint mock = getMockEndpoint("mock:invoke_function_result"); 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 8cb4506..ad5412b 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,11 +20,15 @@ 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.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionServiceKeyTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionTest.class.getName()); 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 9f0efc5..aa32cb9 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,11 +19,15 @@ package org.apache.camel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.constants.FunctionGraphProperties; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class InvokeFunctionTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(InvokeFunctionTest.class.getName()); diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphConstantsTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphConstantsTest.java index 1a80313..d8090ee 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphConstantsTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphConstantsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphOperationsTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphOperationsTest.java index 5972f35..4cb2073 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphOperationsTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphOperationsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphPropertiesTest.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphPropertiesTest.java index f67ea01..197e8ac 100644 --- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphPropertiesTest.java +++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/test/java/org/apache/camel/constants/FunctionGraphPropertiesTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-iam/pom.xml b/components/camel-huawei/camel-huaweicloud-iam/pom.xml index c51357fe..60086b6 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-iam/pom.xml @@ -69,14 +69,8 @@ <!-- testing --> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit-jupiter-version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> </dependencies> 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 0f8ca27..fd86256 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,12 +21,15 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class GetGroupUsersFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(GetGroupUsersFunctionalTest.class.getName()); @@ -64,7 +67,7 @@ public class GetGroupUsersFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testGetGroupUsers() throws Exception { MockEndpoint mock = getMockEndpoint("mock:get_group_users_result"); 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 5bbb538..d3cf131 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,11 +20,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class GetGroupUsersTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(GetGroupUsersTest.class.getName()); 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 be4837f..da9dc79 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,12 +21,15 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class GetUserFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(GetUserFunctionalTest.class.getName()); @@ -62,7 +65,7 @@ public class GetUserFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testGetUser() throws Exception { MockEndpoint mock = getMockEndpoint("mock:get_user_result"); 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 9d06e74..aba8c7f 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,11 +21,13 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class GetUserTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(GetUserTest.class.getName()); 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 76ac0e4..7724b8b 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,12 +19,15 @@ package org.apache.camel.component.huaweicloud.iam; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ListGroupsFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ListGroupsFunctionalTest.class.getName()); @@ -55,7 +58,7 @@ public class ListGroupsFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListGroups() throws Exception { MockEndpoint mock = getMockEndpoint("mock:list_groups_result"); 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 9119518..f0ab435 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,11 +20,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListGroupsTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ListGroupsTest.class.getName()); 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 dafb201..c8c8ece 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,12 +19,15 @@ package org.apache.camel.component.huaweicloud.iam; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ListUsersFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ListUsersFunctionalTest.class.getName()); @@ -55,7 +58,7 @@ public class ListUsersFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListUsers() throws Exception { MockEndpoint mock = getMockEndpoint("mock:list_users_result"); 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 5e6287b..87ce38a 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,11 +20,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListUsersTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ListUsersTest.class.getName()); 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 16087d5..36fa913e 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,12 +22,15 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class UpdateGroupFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateGroupFunctionalTest.class.getName()); @@ -64,7 +67,7 @@ public class UpdateGroupFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testUpdateGroup() throws Exception { MockEndpoint mock = getMockEndpoint("mock:update_group_result"); 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 aa75f3a..ea32971 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,12 +21,15 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class UpdateGroupJsonFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateGroupJsonFunctionalTest.class.getName()); @@ -63,7 +66,7 @@ public class UpdateGroupJsonFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testUpdateGroup() throws Exception { MockEndpoint mock = getMockEndpoint("mock:update_group_result"); 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 0e36a90..6b2099a 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,11 +21,13 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class UpdateGroupJsonTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateGroupJsonTest.class.getName()); 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 65c0003..34d2129 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,11 +22,13 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class UpdateGroupTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateGroupTest.class.getName()); 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 37cdbc9..87aa3c0 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,12 +20,15 @@ import com.huaweicloud.sdk.iam.v3.model.UpdateUserOption; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class UpdateUserFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateUserFunctionalTest.class.getName()); @@ -58,7 +61,7 @@ public class UpdateUserFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testUpdateUser() throws Exception { MockEndpoint mock = getMockEndpoint("mock:update_user_result"); 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 380a4ca..86b612f 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,12 +19,15 @@ package org.apache.camel.component.huaweicloud.iam; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class UpdateUserJsonFunctionalTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateUserJsonFunctionalTest.class.getName()); @@ -57,7 +60,7 @@ public class UpdateUserJsonFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testUpdateUser() throws Exception { MockEndpoint mock = getMockEndpoint("mock:update_user_result"); 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 4ee7ed5..462c344 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,11 +20,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class UpdateUserJsonTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateUserJsonTest.class.getName()); 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 1aad29f..f532633 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,11 +21,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class UpdateUserTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UpdateUserTest.class.getName()); diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMOperationsTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMOperationsTest.java index e991806..22bcf71 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMOperationsTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMOperationsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.iam.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMPropertiesTest.java b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMPropertiesTest.java index 9ca8f85..d70b85d 100644 --- a/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMPropertiesTest.java +++ b/components/camel-huawei/camel-huaweicloud-iam/src/test/java/org/apache/camel/component/huaweicloud/iam/constants/IAMPropertiesTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.iam.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-obs/pom.xml b/components/camel-huawei/camel-huaweicloud-obs/pom.xml index 893685f..7f58df8 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-obs/pom.xml @@ -69,14 +69,8 @@ <!-- testing --> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit-jupiter-version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> 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 fdb7bb7..9372142 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,9 +19,12 @@ package org.apache.camel.component.huaweicloud.obs; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BucketMetadataFunctionalTest extends CamelTestSupport { @@ -55,7 +58,7 @@ public class BucketMetadataFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:bucket_metadata_result"); 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 3a10a7c..0578e93 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,10 +24,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class BucketMetadataTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 c024788..8fce4be 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,9 +20,11 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class CheckBucketFunctionalTest extends CamelTestSupport { @@ -56,7 +58,7 @@ public class CheckBucketFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:check_bucket_result"); 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 0783d7e..6863b43 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,10 +23,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class CheckBucketTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 ca6dc40..a1baaf3 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,9 +21,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateBucketFunctionalTest extends CamelTestSupport { @@ -60,7 +63,7 @@ public class CreateBucketFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testCreateBucket() throws Exception { MockEndpoint mock = getMockEndpoint("mock:create_bucket_result"); 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 11ccd4f..c2e535d 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,9 +21,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateBucketJsonFunctionalTest extends CamelTestSupport { @@ -58,7 +61,7 @@ public class CreateBucketJsonFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testCreateBucket() throws Exception { MockEndpoint mock = getMockEndpoint("mock:create_bucket_result"); 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 91f8e5a..907a993 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,12 +24,14 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateBucketJsonTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(CreateBucketJsonTest.class.getName()); 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 bf057d8..aa66494 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,9 +22,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CreateBucketPojoFunctionalTest extends CamelTestSupport { @@ -59,7 +62,7 @@ public class CreateBucketPojoFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testCreateBucket() throws Exception { MockEndpoint mock = getMockEndpoint("mock:create_bucket_result"); 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 60a3038..abab013 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,12 +24,14 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateBucketPojoTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(CreateBucketPojoTest.class.getName()); 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 a4c95e0..d418166 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,12 +24,14 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CreateBucketTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(CreateBucketTest.class.getName()); 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 e316e94..fe63091 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,9 +21,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DeleteBucketFunctionalTest extends CamelTestSupport { @@ -58,7 +61,7 @@ public class DeleteBucketFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testDeleteBucket() throws Exception { MockEndpoint mock = getMockEndpoint("mock:delete_bucket_result"); 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 9ab803e..d65627a 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,12 +26,14 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DeleteBucketTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(DeleteBucketTest.class.getName()); 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 9910c6e..b45b46a 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,9 +24,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test download objects with deleteAfterRead = true @@ -69,7 +72,7 @@ public class DownloadDeleteFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:download_objects_result"); 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 210f572..025424b 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,9 +24,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test download objects with all parameters set as default @@ -69,7 +72,7 @@ public class DownloadFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:download_objects_result"); 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 a16c223..eed898d 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,9 +24,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test download objects with moveAfterRead = true and destination bucket already exists @@ -71,7 +74,7 @@ public class DownloadMoveExistsFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:download_objects_result"); 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 0e63d86..5e18531 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,9 +24,12 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test download objects with moveAfterRead = true and destination bucket does not already exist @@ -71,7 +74,7 @@ public class DownloadMoveFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:download_objects_result"); 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 4e389f1..e851172 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,9 +22,13 @@ import org.apache.camel.builder.RouteBuilder; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test download objects with specific filename given @@ -65,7 +69,7 @@ public class DownloadSingleFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:download_objects_result"); 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 a98ba6b..020c195 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,9 +19,12 @@ package org.apache.camel.component.huaweicloud.obs; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ListBucketsFunctionalTest extends CamelTestSupport { @@ -52,7 +55,7 @@ public class ListBucketsFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:list_buckets_result"); 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 7f930ac..f48a148 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,12 +29,14 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListBucketsTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ListBucketsTest.class.getName()); 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 3394182..7952f5a 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,9 +21,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ListObjectsFunctionalTest extends CamelTestSupport { @@ -59,7 +62,7 @@ public class ListObjectsFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:list_objects_result"); 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 a7cf235..b88bcb5 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,9 +21,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ListObjectsJsonFunctionalTest extends CamelTestSupport { @@ -58,7 +61,7 @@ public class ListObjectsJsonFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:list_objects_result"); 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 e036352..e8ae33a 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,10 +28,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListObjectsJsonTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 0fa3788..7411135 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,10 +30,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListObjectsMaxTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 679a5e9..9f8f617 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,9 +22,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ListObjectsPojoFunctionalTest extends CamelTestSupport { @@ -59,7 +62,7 @@ public class ListObjectsPojoFunctionalTest extends CamelTestSupport { * * @throws Exception */ - @Ignore("Manually enable this once you configure the parameters in the placeholders above") + @Disabled("Manually enable this once you configure the parameters in the placeholders above") @Test public void testListBuckets() throws Exception { MockEndpoint mock = getMockEndpoint("mock:list_objects_result"); 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 2a6e6b3..0e5198a 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,10 +28,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListObjectsPojoTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); 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 f19d4bc..e385289 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,10 +28,12 @@ import org.apache.camel.Exchange; 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.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ListObjectsTest extends CamelTestSupport { TestConfiguration testConfiguration = new TestConfiguration(); diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSConstantsTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSConstantsTest.java index 525ee30..3d1525a 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSConstantsTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSConstantsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.obs.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSHeadersTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSHeadersTest.java index d1d590e4..a83f307 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSHeadersTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSHeadersTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.obs.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSOperationsTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSOperationsTest.java index c1d0aaf..e72b355 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSOperationsTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSOperationsTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.obs.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSPropertiesTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSPropertiesTest.java index f9b0913..4064aa7 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSPropertiesTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/constants/OBSPropertiesTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.obs.constants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/models/OBSRegionTest.java b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/models/OBSRegionTest.java index 7234d57..35bada3 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/models/OBSRegionTest.java +++ b/components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/models/OBSRegionTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.huaweicloud.obs.models; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-huawei/camel-huaweicloud-smn/pom.xml b/components/camel-huawei/camel-huaweicloud-smn/pom.xml index 3d07e23..310679d 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-smn/pom.xml @@ -72,20 +72,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-catalog</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-junit5</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project>