You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/04/19 10:43:12 UTC
[camel] branch master updated: camel-16400: avoid regenerating
tests for some components (#5410)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 59ac7c6 camel-16400: avoid regenerating tests for some components (#5410)
59ac7c6 is described below
commit 59ac7c6aeecde716326ffd067051720d0417daaa
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Mon Apr 19 12:42:49 2021 +0200
camel-16400: avoid regenerating tests for some components (#5410)
* camel-16400: adjust integration tests to avoid component plugin from recreating them for camel-as2
* camel-16400: adjust integration tests to avoid component plugin from recreating them for google components
* camel-16400: adjust integration tests to avoid component plugin from recreating them for camel-braintree
---
.../{AS2ClientManagerIntegrationTest.java => AS2ClientManagerIT.java} | 4 ++--
.../{AS2ServerManagerIntegrationTest.java => AS2ServerManagerIT.java} | 4 ++--
.../as2/{AbstractAS2TestSupport.java => AbstractAS2ITSupport.java} | 2 +-
.../camel/component/braintree/{integration => }/AddOnGatewayIT.java | 3 +--
.../camel/component/braintree/{integration => }/AddressGatewayIT.java | 3 +--
.../component/braintree/{integration => }/ClientTokenGatewayIT.java | 3 +--
.../braintree/{integration => }/CreditCardVerificationGatewayIT.java | 3 +--
.../component/braintree/{integration => }/CustomerGatewayIT.java | 3 +--
.../component/braintree/{integration => }/DiscountGatewayIT.java | 3 +--
.../camel/component/braintree/{integration => }/DisputeGatewayIT.java | 3 +--
.../braintree/{integration => }/DocumentUploadGatewayIT.java | 3 +--
.../braintree/{integration => }/MerchantAccountGatewayIT.java | 3 +--
.../component/braintree/{integration => }/PaymentMethodGatewayIT.java | 3 +--
.../braintree/{integration => }/PaymentMethodNonceGatewayIT.java | 3 +--
.../camel/component/braintree/{integration => }/PlanGatewayIT.java | 3 +--
.../camel/component/braintree/{integration => }/ReportGatewayIT.java | 3 +--
.../braintree/{integration => }/SettlementBatchSummaryGatewayIT.java | 3 +--
.../component/braintree/{integration => }/SubscriptionGatewayIT.java | 3 +--
.../component/braintree/{integration => }/TransactionGatewayIT.java | 3 +--
.../braintree/{integration => }/WebhookNotificationGatewayIT.java | 4 +---
.../component/google/calendar/{integration => }/CalendarAclIT.java | 3 +--
.../google/calendar/{integration => }/CalendarCalendarListIT.java | 3 +--
.../google/calendar/{integration => }/CalendarCalendarsIT.java | 3 +--
.../component/google/calendar/{integration => }/CalendarColorsIT.java | 3 +--
.../component/google/calendar/{integration => }/CalendarEventsIT.java | 3 +--
.../google/calendar/{integration => }/CalendarFreebusyIT.java | 3 +--
.../google/calendar/{integration => }/CalendarSettingsIT.java | 3 +--
.../camel/component/google/drive/{integration => }/DriveAboutIT.java | 3 +--
.../camel/component/google/drive/{integration => }/DriveAppsIT.java | 3 +--
.../component/google/drive/{integration => }/DriveChangesIT.java | 3 +--
.../component/google/drive/{integration => }/DriveChildrenIT.java | 3 +--
.../component/google/drive/{integration => }/DriveCommentsIT.java | 3 +--
.../camel/component/google/drive/{integration => }/DriveFilesIT.java | 3 +--
.../component/google/drive/{integration => }/DrivePermissionsIT.java | 3 +--
.../component/google/drive/{integration => }/DrivePropertiesIT.java | 3 +--
.../component/google/drive/{integration => }/DriveRepliesIT.java | 3 +--
.../component/google/drive/{integration => }/DriveRevisionsIT.java | 3 +--
.../component/google/drive/{integration => }/FileConverterIT.java | 3 +--
.../component/google/drive/{integration => }/FilesConsumerIT.java | 3 +--
.../camel/component/google/mail/{integration => }/GmailUsersIT.java | 3 +--
.../component/google/mail/{integration => }/GmailUsersLabelsIT.java | 3 +--
.../google/mail/{integration => }/GmailUsersMessagesConsumerIT.java | 3 +--
.../component/google/mail/{integration => }/GmailUsersMessagesIT.java | 3 +--
.../component/google/mail/{integration => }/GmailUsersThreadsIT.java | 3 +--
.../google/sheets/{integration => }/SheetsSpreadsheetsIT.java | 3 +--
.../google/sheets/{integration => }/SheetsSpreadsheetsValuesIT.java | 3 +--
46 files changed, 48 insertions(+), 92 deletions(-)
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
similarity index 99%
rename from components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
rename to components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
index 8c35aef..d22717c 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
@@ -104,9 +104,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test class for {@link org.apache.camel.component.as2.api.AS2ClientManager} APIs.
*/
-public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
+public class AS2ClientManagerIT extends AbstractAS2ITSupport {
- private static final Logger LOG = LoggerFactory.getLogger(AS2ClientManagerIntegrationTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AS2ClientManagerIT.class);
private static final String PATH_PREFIX
= AS2ApiCollection.getCollection().getApiName(AS2ClientManagerApiMethod.class).getName();
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java
similarity index 99%
rename from components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
rename to components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java
index c361374..6c1a1b1 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java
@@ -82,11 +82,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test class for {@link org.apache.camel.component.as2.api.AS2ServerManager} APIs.
*/
-public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
+public class AS2ServerManagerIT extends AbstractAS2ITSupport {
private static final String PROCESSOR_EXCEPTION_MSG = "Processor Exception";
private static final String EXPECTED_EXCEPTION_MSG = "Failed to process AS2 message: " + PROCESSOR_EXCEPTION_MSG;
- private static final Logger LOG = LoggerFactory.getLogger(AS2ServerManagerIntegrationTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AS2ServerManagerIT.class);
private static final String PATH_PREFIX
= AS2ApiCollection.getCollection().getApiName(AS2ServerManagerApiMethod.class).getName();
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java
similarity index 98%
rename from components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
rename to components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java
index 95cb55b..1b09968 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.TestInstance.Lifecycle;
* Abstract base class for AS2 Integration tests generated by Camel API component maven plugin.
*/
@TestInstance(Lifecycle.PER_CLASS)
-public class AbstractAS2TestSupport extends CamelTestSupport {
+public class AbstractAS2ITSupport extends CamelTestSupport {
private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/AddOnGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddOnGatewayIT.java
similarity index 94%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/AddOnGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddOnGatewayIT.java
index ace9e74..7b5808e 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/AddOnGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddOnGatewayIT.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.List;
import com.braintreegateway.AddOn;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.AddOnGatewayApiMethod;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/AddressGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIT.java
similarity index 98%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/AddressGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIT.java
index 5093d37..d6188ae 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/AddressGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.LinkedList;
import java.util.List;
@@ -27,7 +27,6 @@ import com.braintreegateway.Customer;
import com.braintreegateway.CustomerRequest;
import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.AddressGatewayApiMethod;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.junit.jupiter.api.AfterEach;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/ClientTokenGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIT.java
similarity index 93%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/ClientTokenGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIT.java
index c7f67e9..ce72001 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/ClientTokenGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.ClientTokenGatewayApiMethod;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/CreditCardVerificationGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayIT.java
similarity index 96%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/CreditCardVerificationGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayIT.java
index 70ea600..76e203c 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/CreditCardVerificationGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayIT.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import com.braintreegateway.CreditCardVerification;
import com.braintreegateway.ResourceCollection;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.CreditCardVerificationGatewayApiMethod;
import org.junit.jupiter.api.Disabled;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/CustomerGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIT.java
similarity index 98%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/CustomerGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIT.java
index 49891f1..84ba9f6 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/CustomerGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.HashMap;
import java.util.UUID;
@@ -30,7 +30,6 @@ import com.braintreegateway.ValidationErrors;
import com.braintreegateway.exceptions.NotFoundException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.CustomerGatewayApiMethod;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DiscountGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DiscountGatewayIT.java
similarity index 94%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DiscountGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DiscountGatewayIT.java
index d44f5b1..01ccf34 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DiscountGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DiscountGatewayIT.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.List;
import com.braintreegateway.Discount;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.DiscountGatewayApiMethod;
import org.junit.jupiter.api.Disabled;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DisputeGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIT.java
similarity index 99%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DisputeGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIT.java
index 8496d6a..d6df106 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DisputeGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.io.File;
import java.math.BigDecimal;
@@ -35,7 +35,6 @@ import com.braintreegateway.TextEvidenceRequest;
import com.braintreegateway.Transaction;
import com.braintreegateway.TransactionRequest;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.DisputeGatewayApiMethod;
import org.apache.camel.component.braintree.internal.DocumentUploadGatewayApiMethod;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DocumentUploadGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DocumentUploadGatewayIT.java
similarity index 95%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DocumentUploadGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DocumentUploadGatewayIT.java
index 896a836..ea28437 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/DocumentUploadGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DocumentUploadGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.io.File;
@@ -22,7 +22,6 @@ import com.braintreegateway.DocumentUpload;
import com.braintreegateway.DocumentUploadRequest;
import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.DocumentUploadGatewayApiMethod;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/MerchantAccountGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIT.java
similarity index 97%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/MerchantAccountGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIT.java
index d6554a6..fe44de2 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/MerchantAccountGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.HashMap;
import java.util.Map;
@@ -24,7 +24,6 @@ import com.braintreegateway.MerchantAccount;
import com.braintreegateway.MerchantAccountRequest;
import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.BraintreeConstants;
import org.apache.camel.component.braintree.internal.MerchantAccountGatewayApiMethod;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PaymentMethodGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIT.java
similarity index 98%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PaymentMethodGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIT.java
index cfdacdc..eb008d7 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PaymentMethodGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.LinkedList;
import java.util.List;
@@ -27,7 +27,6 @@ import com.braintreegateway.PaymentMethod;
import com.braintreegateway.PaymentMethodRequest;
import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.PaymentMethodGatewayApiMethod;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PaymentMethodNonceGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIT.java
similarity index 95%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PaymentMethodNonceGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIT.java
index 4a74067..9efad35 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PaymentMethodNonceGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.PaymentMethodNonceGatewayApiMethod;
import org.junit.jupiter.api.Disabled;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PlanGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIT.java
similarity index 94%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PlanGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIT.java
index 3c1cc21..778db54 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/PlanGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIT.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.List;
import com.braintreegateway.Plan;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.PlanGatewayApiMethod;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/ReportGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ReportGatewayIT.java
similarity index 96%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/ReportGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ReportGatewayIT.java
index cfb1f87..ba14da4 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/ReportGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ReportGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -22,7 +22,6 @@ import java.util.Calendar;
import com.braintreegateway.TransactionLevelFeeReport;
import com.braintreegateway.TransactionLevelFeeReportRequest;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.ReportGatewayApiMethod;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/SettlementBatchSummaryGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIT.java
similarity index 96%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/SettlementBatchSummaryGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIT.java
index 59d9f96..7be1e47 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/SettlementBatchSummaryGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIT.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.SettlementBatchSummaryGatewayApiMethod;
import org.junit.jupiter.api.Disabled;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/SubscriptionGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIT.java
similarity index 98%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/SubscriptionGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIT.java
index e9626b1..1a77ebb 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/SubscriptionGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIT.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.SubscriptionGatewayApiMethod;
import org.junit.jupiter.api.Disabled;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/TransactionGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIT.java
similarity index 99%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/TransactionGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIT.java
index f816c7a..2968d22 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/TransactionGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.math.BigDecimal;
import java.util.HashMap;
@@ -29,7 +29,6 @@ import com.braintreegateway.TransactionCloneRequest;
import com.braintreegateway.TransactionRefundRequest;
import com.braintreegateway.TransactionRequest;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.TransactionGatewayApiMethod;
import org.junit.jupiter.api.AfterEach;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/WebhookNotificationGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIT.java
similarity index 98%
rename from components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/WebhookNotificationGatewayIT.java
rename to components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIT.java
index 4282b7d..42f25d3 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/integration/WebhookNotificationGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.braintree.integration;
+package org.apache.camel.component.braintree;
import java.text.SimpleDateFormat;
import java.util.HashMap;
@@ -25,8 +25,6 @@ import com.braintreegateway.ConnectedMerchantPayPalStatusChanged;
import com.braintreegateway.ConnectedMerchantStatusTransitioned;
import com.braintreegateway.WebhookNotification;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.AbstractBraintreeTestSupport;
-import org.apache.camel.component.braintree.AuthenticationType;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.BraintreeConstants;
import org.apache.camel.component.braintree.internal.WebhookNotificationGatewayApiMethod;
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarAclIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarAclIT.java
similarity index 95%
rename from components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarAclIT.java
rename to components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarAclIT.java
index e24e5d3..bf26a05 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarAclIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarAclIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.calendar.integration;
+package org.apache.camel.component.google.calendar;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.calendar.AbstractGoogleCalendarTestSupport;
import org.apache.camel.component.google.calendar.internal.CalendarAclApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarCalendarListIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIT.java
similarity index 96%
rename from components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarCalendarListIT.java
rename to components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIT.java
index a7b5eb1..8d263a9 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarCalendarListIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIT.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.calendar.integration;
+package org.apache.camel.component.google.calendar;
import com.google.api.services.calendar.model.Calendar;
import com.google.api.services.calendar.model.CalendarList;
import com.google.api.services.calendar.model.CalendarListEntry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.calendar.AbstractGoogleCalendarTestSupport;
import org.apache.camel.component.google.calendar.internal.CalendarCalendarListApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarCalendarsIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarsIT.java
similarity index 96%
rename from components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarCalendarsIT.java
rename to components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarsIT.java
index c8acd86..7c22fb1 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarCalendarsIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarsIT.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.calendar.integration;
+package org.apache.camel.component.google.calendar;
import java.util.HashMap;
import java.util.Map;
import com.google.api.services.calendar.model.Calendar;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.calendar.AbstractGoogleCalendarTestSupport;
import org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarColorsIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarColorsIT.java
similarity index 94%
rename from components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarColorsIT.java
rename to components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarColorsIT.java
index e1b33e2..4dbb16b 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarColorsIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarColorsIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.calendar.integration;
+package org.apache.camel.component.google.calendar;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.calendar.AbstractGoogleCalendarTestSupport;
import org.apache.camel.component.google.calendar.internal.CalendarColorsApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarEventsIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarEventsIT.java
similarity index 98%
rename from components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarEventsIT.java
rename to components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarEventsIT.java
index d4ef6a1..63ea0e0 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarEventsIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarEventsIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.calendar.integration;
+package org.apache.camel.component.google.calendar;
import java.util.ArrayList;
import java.util.Date;
@@ -27,7 +27,6 @@ import com.google.api.services.calendar.model.Event;
import com.google.api.services.calendar.model.EventAttendee;
import com.google.api.services.calendar.model.EventDateTime;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.calendar.AbstractGoogleCalendarTestSupport;
import org.apache.camel.component.google.calendar.internal.CalendarEventsApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarFreebusyIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarFreebusyIT.java
similarity index 95%
rename from components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarFreebusyIT.java
rename to components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarFreebusyIT.java
index af358fb..48ebf97 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarFreebusyIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarFreebusyIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.calendar.integration;
+package org.apache.camel.component.google.calendar;
import java.util.ArrayList;
import java.util.List;
@@ -23,7 +23,6 @@ import com.google.api.client.util.DateTime;
import com.google.api.services.calendar.model.FreeBusyRequest;
import com.google.api.services.calendar.model.FreeBusyRequestItem;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.calendar.AbstractGoogleCalendarTestSupport;
import org.apache.camel.component.google.calendar.internal.CalendarFreebusyApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarSettingsIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarSettingsIT.java
similarity index 95%
rename from components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarSettingsIT.java
rename to components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarSettingsIT.java
index 0fbf8b6..51b9e81 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/integration/CalendarSettingsIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarSettingsIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.calendar.integration;
+package org.apache.camel.component.google.calendar;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.calendar.AbstractGoogleCalendarTestSupport;
import org.apache.camel.component.google.calendar.internal.CalendarSettingsApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveAboutIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIT.java
similarity index 94%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveAboutIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIT.java
index db731f3..e22fa16 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveAboutIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveAboutApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveAppsIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIT.java
similarity index 94%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveAppsIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIT.java
index 6ec5726..e286ab2 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveAppsIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAppsIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveAppsApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Disabled;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveChangesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIT.java
similarity index 96%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveChangesIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIT.java
index f8380c9..110f54b 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveChangesIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIT.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import java.util.List;
import com.google.api.services.drive.model.Change;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveChangesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveChildrenIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIT.java
similarity index 97%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveChildrenIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIT.java
index 0b4425f..e3b67f0 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveChildrenIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChildrenIT.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import java.util.HashMap;
import java.util.Map;
import com.google.api.services.drive.model.File;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveChildrenApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveCommentsIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIT.java
similarity index 97%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveCommentsIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIT.java
index fc48d73..e3035e2 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveCommentsIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import java.util.HashMap;
import java.util.Map;
@@ -22,7 +22,6 @@ import java.util.Map;
import com.google.api.services.drive.model.Comment;
import com.google.api.services.drive.model.File;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveCommentsApiMethod;
import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveFilesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java
similarity index 98%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveFilesIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java
index 381c0fa..514b919 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveFilesIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,7 +26,6 @@ import com.google.api.client.util.DateTime;
import com.google.api.services.drive.model.File;
import com.google.api.services.drive.model.FileList;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Disabled;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DrivePermissionsIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIT.java
similarity index 96%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DrivePermissionsIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIT.java
index 18e5d71..31d528c 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DrivePermissionsIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIT.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import com.google.api.services.drive.model.File;
import com.google.api.services.drive.model.PermissionList;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DrivePermissionsApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DrivePropertiesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIT.java
similarity index 96%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DrivePropertiesIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIT.java
index 3116dc5..04c597d 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DrivePropertiesIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePropertiesIT.java
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import com.google.api.services.drive.model.File;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DrivePropertiesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveRepliesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIT.java
similarity index 97%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveRepliesIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIT.java
index 0e3ecb6..0f41d53 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveRepliesIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import java.util.HashMap;
import java.util.Map;
@@ -22,7 +22,6 @@ import java.util.Map;
import com.google.api.services.drive.model.Comment;
import com.google.api.services.drive.model.File;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
import org.apache.camel.component.google.drive.internal.DriveRepliesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveRevisionsIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIT.java
similarity index 96%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveRevisionsIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIT.java
index 07bb14d..c8ea75a 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/DriveRevisionsIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIT.java
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import com.google.api.services.drive.model.File;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveRevisionsApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/FileConverterIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java
similarity index 95%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/FileConverterIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java
index 21e2567..166225e 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/FileConverterIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import com.google.api.services.drive.model.File;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/FilesConsumerIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIT.java
similarity index 95%
rename from components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/FilesConsumerIT.java
rename to components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIT.java
index c973494..bbf415d 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/integration/FilesConsumerIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIT.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.drive.integration;
+package org.apache.camel.component.google.drive;
import com.google.api.services.drive.model.File;
import com.google.api.services.drive.model.FileList;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.drive.AbstractGoogleDriveTestSupport;
import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIT.java
similarity index 94%
rename from components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersIT.java
rename to components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIT.java
index 85e6448..cb536da 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIT.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.mail.integration;
+package org.apache.camel.component.google.mail;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.mail.AbstractGoogleMailTestSupport;
import org.apache.camel.component.google.mail.internal.GmailUsersApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersLabelsIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIT.java
similarity index 97%
rename from components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersLabelsIT.java
rename to components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIT.java
index 639950c..ee29c6d 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersLabelsIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIT.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.mail.integration;
+package org.apache.camel.component.google.mail;
import java.util.HashMap;
import java.util.Map;
import com.google.api.services.gmail.model.Label;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.mail.AbstractGoogleMailTestSupport;
import org.apache.camel.component.google.mail.internal.GmailUsersLabelsApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersMessagesConsumerIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesConsumerIT.java
similarity index 95%
rename from components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersMessagesConsumerIT.java
rename to components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesConsumerIT.java
index 424539d..5f2a7f4 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersMessagesConsumerIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesConsumerIT.java
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.mail.integration;
+package org.apache.camel.component.google.mail;
import com.google.api.services.gmail.model.ListMessagesResponse;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.mail.AbstractGoogleMailTestSupport;
import org.apache.camel.component.google.mail.internal.GmailUsersMessagesApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersMessagesIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
similarity index 98%
rename from components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersMessagesIT.java
rename to components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
index d30d7a4..b67ceeb 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersMessagesIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.mail.integration;
+package org.apache.camel.component.google.mail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -31,7 +31,6 @@ import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
import com.google.api.services.gmail.model.ListMessagesResponse;
import com.google.api.services.gmail.model.Message;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.mail.AbstractGoogleMailTestSupport;
import org.apache.camel.component.google.mail.internal.GmailUsersMessagesApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersThreadsIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
similarity index 97%
rename from components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersThreadsIT.java
rename to components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
index 648c09c..5cba04c 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/integration/GmailUsersThreadsIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.mail.integration;
+package org.apache.camel.component.google.mail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -29,7 +29,6 @@ import javax.mail.internet.MimeMessage;
import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
import com.google.api.services.gmail.model.Message;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.mail.AbstractGoogleMailTestSupport;
import org.apache.camel.component.google.mail.internal.GmailUsersThreadsApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/integration/SheetsSpreadsheetsIT.java b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIT.java
similarity index 97%
rename from components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/integration/SheetsSpreadsheetsIT.java
rename to components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIT.java
index d260097..216b7b2 100644
--- a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/integration/SheetsSpreadsheetsIT.java
+++ b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.sheets.integration;
+package org.apache.camel.component.google.sheets;
import java.security.SecureRandom;
import java.util.Collections;
@@ -28,7 +28,6 @@ import com.google.api.services.sheets.v4.model.Spreadsheet;
import com.google.api.services.sheets.v4.model.SpreadsheetProperties;
import com.google.api.services.sheets.v4.model.UpdateSpreadsheetPropertiesRequest;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.sheets.AbstractGoogleSheetsTestSupport;
import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
import org.apache.camel.component.google.sheets.internal.GoogleSheetsConstants;
import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsApiMethod;
diff --git a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/integration/SheetsSpreadsheetsValuesIT.java b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIT.java
similarity index 98%
rename from components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/integration/SheetsSpreadsheetsValuesIT.java
rename to components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIT.java
index f2617b4..d855d60 100644
--- a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/integration/SheetsSpreadsheetsValuesIT.java
+++ b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.google.sheets.integration;
+package org.apache.camel.component.google.sheets;
import java.util.Arrays;
import java.util.Collections;
@@ -30,7 +30,6 @@ import com.google.api.services.sheets.v4.model.Spreadsheet;
import com.google.api.services.sheets.v4.model.UpdateValuesResponse;
import com.google.api.services.sheets.v4.model.ValueRange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.google.sheets.AbstractGoogleSheetsTestSupport;
import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
import org.apache.camel.component.google.sheets.internal.GoogleSheetsConstants;
import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsValuesApiMethod;