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 64f78d8fd22 [CAMEL-20405] renamed classes from *IntegrationTest.java to *IT.java (#13082) 64f78d8fd22 is described below commit 64f78d8fd22daaa86f8a27f8e0059e2befa30853 Author: Craig Ziesman <craig.zies...@gmail.com> AuthorDate: Sat Feb 17 13:08:37 2024 -0600 [CAMEL-20405] renamed classes from *IntegrationTest.java to *IT.java (#13082) * [CAMEL-20405] renamed classes from *IntegrationTest.java to *IT.java * [CAMEL-20405] removed references to *IntegrationTest.java from POMs * [CAMEL-20405] renamed salesforce integration tests from *IT.java to *ManualIT.java * [CAMEL-20405] renamed salesforce integration tests from *IT.java to *ManualIT.java * [CAMEL-20405] renamed salesforce integration tests from *IT.java to *ManualIT.java * [CAMEL-20405] renamed salesforce integration tests from *IT.java to *ManualIT.java * [CAMEL-20405] prevented salesforce integration tests from running under 'mvn verify' without 'integration' profile --------- Co-authored-by: Craig Ziesman <czies...@redhat.com> --- components/camel-salesforce/camel-salesforce-component/pom.xml | 7 +++++-- ...ApprovalIntegrationTest.java => AbstractApprovalManualIT.java} | 4 ++-- ...AnalyticsApiIntegrationTest.java => AnalyticsApiManualIT.java} | 4 ++-- ...ExamplesIntegrationTest.java => ApprovalExamplesManualIT.java} | 4 ++-- .../{ApprovalIntegrationTest.java => ApprovalManualIT.java} | 4 ++-- ...BulkApiBatchIntegrationTest.java => BulkApiBatchManualIT.java} | 6 +++--- .../{BulkApiJobIntegrationTest.java => BulkApiJobManualIT.java} | 2 +- .../{BulkApiIntegrationTest.java => BulkApiManualIT.java} | 2 +- ...BulkApiQueryIntegrationTest.java => BulkApiQueryManualIT.java} | 2 +- ...estJobIntegrationTest.java => BulkApiV2IngestJobManualIT.java} | 2 +- ...ueryJobIntegrationTest.java => BulkApiV2QueryJobManualIT.java} | 2 +- ...umerIntegrationTest.java => ChangeEventsConsumerManualIT.java} | 2 +- ...piBatchIntegrationTest.java => CompositeApiBatchManualIT.java} | 2 +- ...sIntegrationTest.java => CompositeApiCollectionsManualIT.java} | 2 +- ...CompositeApiIntegrationTest.java => CompositeApiManualIT.java} | 2 +- ...eApiTreeIntegrationTest.java => CompositeApiTreeManualIT.java} | 2 +- ...mpoundTypesIntegrationTest.java => CompoundTypesManualIT.java} | 4 ++-- .../{HttpProxyIntegrationTest.java => HttpProxyManualIT.java} | 8 ++++---- .../{LazyLoginIntegrationTest.java => LazyLoginManualIT.java} | 2 +- .../{LimitsIntegrationTest.java => LimitsManualIT.java} | 2 +- .../{NotFoundIntegrationTest.java => NotFoundManualIT.java} | 2 +- ...erIntegrationTest.java => PlatformEventsConsumerManualIT.java} | 2 +- .../{PubSubApiIntegrationTest.java => PubSubApiManualIT.java} | 2 +- ...RawOperationIntegrationTest.java => RawOperationManualIT.java} | 2 +- .../{RecentIntegrationTest.java => RecentManualIT.java} | 4 ++-- .../{RestApiIntegrationTest.java => RestApiManualIT.java} | 2 +- ...tionTest.java => SalesforceClientCredentialsFlowManualIT.java} | 2 +- ...ComponentIntegrationTest.java => SalesforceComponentTest.java} | 2 +- ...est.java => SalesforceComponentVerifierExtensionManualIT.java} | 2 +- ...HeadersIntegrationTest.java => SalesforceHeadersManualIT.java} | 2 +- ...IntegrationTest.java => SalesforceJwtBearerTokenFlowTest.java} | 2 +- ...StreamingApiIntegrationTest.java => StreamingApiManualIT.java} | 2 +- .../{SessionIntegrationTest.java => SessionManualIT.java} | 4 ++-- ...HelperIntegrationTest.java => SubscriptionHelperManualIT.java} | 8 ++++---- ...ceMojoIntegrationTest.java => AbstractSalesforceMojoTest.java} | 2 +- ...eMojoIntegrationTest.java => CamelSalesforceMojoManualIT.java} | 4 ++-- ...ubMojoIntegrationTest.java => GeneratePubSubMojoManualIT.java} | 4 ++-- ...tpProxyMojoIntegrationTest.java => HttpProxyMojoManualIT.java} | 2 +- .../{SchemaMojoIntegrationTest.java => SchemaMojoManualIT.java} | 4 ++-- components/camel-salesforce/pom.xml | 3 ++- components/camel-spring-xml/pom.xml | 1 - parent/pom.xml | 2 +- 42 files changed, 64 insertions(+), 61 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index ae28c0ea889..247a09bca30 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -307,6 +307,9 @@ <profiles> <profile> <id>integration</id> + <properties> + <skipITs>false</skipITs> + </properties> <build> <plugins> <plugin> @@ -462,7 +465,7 @@ https://developer.salesforce.com/page/Force.com_Migration_Tool]]></message> <reuseForks>true</reuseForks> <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <includes> - <include>**/*IntegrationTest.java</include> + <include>**/*ManualIT.java</include> </includes> <excludedGroups>standalone</excludedGroups> <forkedProcessExitTimeoutInSeconds>240</forkedProcessExitTimeoutInSeconds> @@ -478,7 +481,7 @@ https://developer.salesforce.com/page/Force.com_Migration_Tool]]></message> <childDelegation>false</childDelegation> <useFile>true</useFile> <includes> - <include>**/*IntegrationTest.java</include> + <include>**/*ManualIT.java</include> </includes> <groups>standalone</groups> </configuration> diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractApprovalIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractApprovalManualIT.java similarity index 95% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractApprovalIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractApprovalManualIT.java index 0550bef00b3..cbca22ddd08 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractApprovalIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractApprovalManualIT.java @@ -28,7 +28,7 @@ import org.apache.camel.component.salesforce.dto.generated.Account; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -public abstract class AbstractApprovalIntegrationTest extends AbstractSalesforceTestBase { +public abstract class AbstractApprovalManualIT extends AbstractSalesforceTestBase { protected static final Object NOT_USED = null; @@ -38,7 +38,7 @@ public abstract class AbstractApprovalIntegrationTest extends AbstractSalesforce private final int accountCount; - AbstractApprovalIntegrationTest(final int accountCount) { + AbstractApprovalManualIT(final int accountCount) { this.accountCount = accountCount; } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiManualIT.java similarity index 99% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiManualIT.java index ad6bc6cc94c..9e3c1dd3911 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiManualIT.java @@ -47,9 +47,9 @@ import static org.junit.jupiter.api.Assertions.fail; /** * Integration test for Salesforce analytics API endpoints. */ -public class AnalyticsApiIntegrationTest extends AbstractSalesforceTestBase { +public class AnalyticsApiManualIT extends AbstractSalesforceTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AnalyticsApiIntegrationTest.class); + private static final Logger LOG = LoggerFactory.getLogger(AnalyticsApiManualIT.class); private static final int RETRY_DELAY = 5000; private static final int REPORT_RESULT_RETRIES = 5; private static final String[] REPORT_OPTIONS = new String[] { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalExamplesIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalExamplesManualIT.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalExamplesIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalExamplesManualIT.java index c87d602836a..0bf1ae60b6d 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalExamplesIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalExamplesManualIT.java @@ -27,9 +27,9 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class ApprovalExamplesIntegrationTest extends AbstractApprovalIntegrationTest { +public class ApprovalExamplesManualIT extends AbstractApprovalManualIT { - public ApprovalExamplesIntegrationTest() { + public ApprovalExamplesManualIT() { super(3); } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalManualIT.java similarity index 97% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalManualIT.java index a9581621657..96bae40bad8 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalManualIT.java @@ -34,12 +34,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @Parameterized -public class ApprovalIntegrationTest extends AbstractApprovalIntegrationTest { +public class ApprovalManualIT extends AbstractApprovalManualIT { @Parameter private String format; - public ApprovalIntegrationTest() { + public ApprovalManualIT() { super(5); } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchManualIT.java similarity index 94% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchManualIT.java index abb9df0a043..bd16c10810d 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchManualIT.java @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class BulkApiBatchIntegrationTest extends AbstractBulkApiTestBase { +public class BulkApiBatchManualIT extends AbstractBulkApiTestBase { private static final String TEST_REQUEST_XML = "/test-request.xml"; private static final String TEST_REQUEST_CSV = "/test-request.csv"; @@ -44,12 +44,12 @@ public class BulkApiBatchIntegrationTest extends AbstractBulkApiTestBase { List<BatchTest> result = new ArrayList<>(); BatchTest test = new BatchTest(); test.contentType = ContentType.XML; - test.stream = BulkApiBatchIntegrationTest.class.getResourceAsStream(TEST_REQUEST_XML); + test.stream = BulkApiBatchManualIT.class.getResourceAsStream(TEST_REQUEST_XML); result.add(test); test = new BatchTest(); test.contentType = ContentType.CSV; - test.stream = BulkApiBatchIntegrationTest.class.getResourceAsStream(TEST_REQUEST_CSV); + test.stream = BulkApiBatchManualIT.class.getResourceAsStream(TEST_REQUEST_CSV); result.add(test); // TODO test ZIP_XML and ZIP_CSV diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobManualIT.java index 3b03c3df642..516de281bd6 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobManualIT.java @@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.MethodSource; import static org.junit.jupiter.api.Assertions.assertSame; -public class BulkApiJobIntegrationTest extends AbstractBulkApiTestBase { +public class BulkApiJobManualIT extends AbstractBulkApiTestBase { @BeforeEach public void setupProfileWithHardDelete() throws IOException { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiManualIT.java similarity index 97% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiManualIT.java index 85978b5cdff..3ef13507ab8 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiManualIT.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @Tag("standalone") -public class BulkApiIntegrationTest extends AbstractBulkApiTestBase { +public class BulkApiManualIT extends AbstractBulkApiTestBase { @Test public void testRetry() throws Exception { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryManualIT.java index 6a694e8c77c..0f11e832757 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryManualIT.java @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class BulkApiQueryIntegrationTest extends AbstractBulkApiTestBase { +public class BulkApiQueryManualIT extends AbstractBulkApiTestBase { @ParameterizedTest @EnumSource(names = { "XML", "CSV" }) diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2IngestJobIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2IngestJobManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2IngestJobIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2IngestJobManualIT.java index aeeefc85bf1..b24263146e0 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2IngestJobIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2IngestJobManualIT.java @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; @SuppressWarnings("BusyWait") -public class BulkApiV2IngestJobIntegrationTest extends AbstractSalesforceTestBase { +public class BulkApiV2IngestJobManualIT extends AbstractSalesforceTestBase { @Test public void testLifecycle() throws Exception { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2QueryJobIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2QueryJobManualIT.java similarity index 99% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2QueryJobIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2QueryJobManualIT.java index e747e4121d9..e6549ee79b7 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2QueryJobIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiV2QueryJobManualIT.java @@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @SuppressWarnings("BusyWait") -public class BulkApiV2QueryJobIntegrationTest extends AbstractSalesforceTestBase { +public class BulkApiV2QueryJobManualIT extends AbstractSalesforceTestBase { private static final String LAST_NAME = "CamelBulkTest"; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerManualIT.java index 02ae66c6f28..d43cff9fd08 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerManualIT.java @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * merely uses some API calls to trigger some change events, and then perform assertion on the received events. */ @Tag("standalone") -public class ChangeEventsConsumerIntegrationTest extends AbstractSalesforceTestBase { +public class ChangeEventsConsumerManualIT extends AbstractSalesforceTestBase { private static final String ACCOUNT_NAME = "ChangeEventsConsumerIntegrationTest-TestAccount"; private static final String ACCOUNT_DESCRIPTION diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchManualIT.java similarity index 99% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchManualIT.java index b5889a6f025..83b0706e220 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchManualIT.java @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @Parameterized -public class CompositeApiBatchIntegrationTest extends AbstractSalesforceTestBase { +public class CompositeApiBatchManualIT extends AbstractSalesforceTestBase { public static class Accounts extends AbstractQueryRecordsBase<Account> { } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsManualIT.java index e61f6b29908..37f1ec26e85 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsManualIT.java @@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @SuppressWarnings("unchecked") @Parameterized -public class CompositeApiCollectionsIntegrationTest extends AbstractSalesforceTestBase { +public class CompositeApiCollectionsManualIT extends AbstractSalesforceTestBase { private static final Set<String> VERSIONS = new HashSet<>(Arrays.asList("46.0", SalesforceEndpointConfig.DEFAULT_VERSION)); diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiManualIT.java similarity index 99% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiManualIT.java index b86e4c15367..6844769e87c 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiManualIT.java @@ -46,7 +46,7 @@ import org.junit.jupiter.api.BeforeEach; import static org.junit.jupiter.api.Assumptions.assumeFalse; @Parameterized -public class CompositeApiIntegrationTest extends AbstractSalesforceTestBase { +public class CompositeApiManualIT extends AbstractSalesforceTestBase { public static class Accounts extends AbstractQueryRecordsBase<Account> { } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeManualIT.java index b0acd823808..11dff8a37c1 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeManualIT.java @@ -31,7 +31,7 @@ import org.apache.camel.test.junit5.params.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; @Parameterized -public class CompositeApiTreeIntegrationTest extends AbstractSalesforceTestBase { +public class CompositeApiTreeManualIT extends AbstractSalesforceTestBase { @Parameter private String format; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesManualIT.java similarity index 97% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesManualIT.java index f7ca827a548..f9d56dfc005 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesManualIT.java @@ -35,9 +35,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * "https://www.salesforce.com/developer/docs/api/index_Left.htm#CSHID=compound_fields.htm|StartTopic=Content%2Fcompound_fields.htm|SkinName=webhelp">Compound * data types</a> */ -public class CompoundTypesIntegrationTest extends AbstractSalesforceTestBase { +public class CompoundTypesManualIT extends AbstractSalesforceTestBase { - private static final Logger LOG = LoggerFactory.getLogger(CompoundTypesIntegrationTest.class); + private static final Logger LOG = LoggerFactory.getLogger(CompoundTypesManualIT.class); @Test public void testTypes() throws Exception { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyManualIT.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyManualIT.java index 251bcb2a9f1..b687b78ca02 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyManualIT.java @@ -51,9 +51,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * Test HTTP proxy configuration for Salesforce component. */ @Parameterized -public class HttpProxyIntegrationTest extends AbstractSalesforceTestBase { +public class HttpProxyManualIT extends AbstractSalesforceTestBase { - private static final Logger LOG = LoggerFactory.getLogger(HttpProxyIntegrationTest.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpProxyManualIT.class); private static final String HTTP_PROXY_HOST = "localhost"; private static final String HTTP_PROXY_USER_NAME = "camel-user"; private static final String HTTP_PROXY_PASSWORD = "camel-user-password"; @@ -69,8 +69,8 @@ public class HttpProxyIntegrationTest extends AbstractSalesforceTestBase { @Parameters public static Iterable<Consumer<SalesforceComponent>> methods() { - return Arrays.asList(HttpProxyIntegrationTest::configureProxyViaComponentProperties, - HttpProxyIntegrationTest::configureProxyViaClientPropertiesMap); + return Arrays.asList(HttpProxyManualIT::configureProxyViaComponentProperties, + HttpProxyManualIT::configureProxyViaClientPropertiesMap); } @Test diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginManualIT.java similarity index 97% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginManualIT.java index 8bbf7b7a0f3..d57192173dc 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginManualIT.java @@ -21,7 +21,7 @@ import java.util.HashMap; import org.apache.camel.component.salesforce.dto.generated.Merchandise__c; import org.junit.jupiter.api.Test; -public class LazyLoginIntegrationTest extends AbstractSalesforceTestBase { +public class LazyLoginManualIT extends AbstractSalesforceTestBase { @Test public void lazyLoginDoesNotThrowExceptions() throws Exception { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LimitsIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LimitsManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LimitsIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LimitsManualIT.java index 0dc7d9a7e96..0fd607e34a4 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LimitsIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LimitsManualIT.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class LimitsIntegrationTest extends AbstractSalesforceTestBase { +public class LimitsManualIT extends AbstractSalesforceTestBase { private static final Object NOT_USED = null; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/NotFoundIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/NotFoundManualIT.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/NotFoundIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/NotFoundManualIT.java index b0050263561..eef9722cb0e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/NotFoundIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/NotFoundManualIT.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -public class NotFoundIntegrationTest extends AbstractSalesforceTestBase { +public class NotFoundManualIT extends AbstractSalesforceTestBase { @Test public void shouldNotReportNotFoundExceptionFromRestApiIfConfiguredNotTo() { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerManualIT.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerManualIT.java index 03341d84f1c..fe565c98393 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerManualIT.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.entry; @Tag("standalone") -public class PlatformEventsConsumerIntegrationTest extends AbstractSalesforceTestBase { +public class PlatformEventsConsumerManualIT extends AbstractSalesforceTestBase { @Test public void shouldConsumePlatformEvents() throws InterruptedException, ExecutionException { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiManualIT.java similarity index 99% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiManualIT.java index efb72e945b8..87321b9de77 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiManualIT.java @@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Tag("standalone") -public class PubSubApiIntegrationTest extends AbstractSalesforceTestBase { +public class PubSubApiManualIT extends AbstractSalesforceTestBase { private final Logger LOG = LoggerFactory.getLogger(getClass()); diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationManualIT.java similarity index 97% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationManualIT.java index 6d543181c75..da6fe6c556d 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationManualIT.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class RawOperationIntegrationTest extends AbstractSalesforceTestBase { +public class RawOperationManualIT extends AbstractSalesforceTestBase { @Test public void testCreate() { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentManualIT.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentManualIT.java index ccd41c248a7..cd73dc4bd28 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RecentManualIT.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.assertListSize; @Tag("standalone") -public class RecentIntegrationTest extends AbstractSalesforceTestBase { +public class RecentManualIT extends AbstractSalesforceTestBase { public static class Accounts extends AbstractQueryRecordsBase<Account> { } @@ -47,7 +47,7 @@ public class RecentIntegrationTest extends AbstractSalesforceTestBase { @BeforeEach public void setupTenRecentItems() { final List<Account> accounts - = IntStream.range(0, 10).mapToObj(RecentIntegrationTest::account).collect(Collectors.toList()); + = IntStream.range(0, 10).mapToObj(RecentManualIT::account).collect(Collectors.toList()); template.sendBody("direct:create-recent", accounts); } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiManualIT.java similarity index 99% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiManualIT.java index a4b91c047a9..0866db4fae6 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiManualIT.java @@ -85,7 +85,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @Tag("standalone") -public class RestApiIntegrationTest extends AbstractSalesforceTestBase { +public class RestApiManualIT extends AbstractSalesforceTestBase { /** * Request DTO for Salesforce APEX REST calls. See diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowManualIT.java similarity index 95% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowManualIT.java index 3c665d1ca0f..e57e60e61e6 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowManualIT.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class SalesforceClientCredentialsFlowIntegrationTest extends CamelTestSupport { +public class SalesforceClientCredentialsFlowManualIT extends CamelTestSupport { @Test public void shouldLoginUsingJwtBearerToken() { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentTest.java similarity index 95% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentTest.java index 91b5f0812b2..8829d0983f0 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentTest.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -public class SalesforceComponentIntegrationTest extends AbstractSalesforceTestBase { +public class SalesforceComponentTest extends AbstractSalesforceTestBase { private SalesforceHttpClient client = new SalesforceHttpClient(); private SalesforceComponent component; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionManualIT.java index 801ea7c78d6..86c68ea940b 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentVerifierExtensionManualIT.java @@ -30,7 +30,7 @@ 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 SalesforceComponentVerifierExtensionIntegrationTest extends CamelTestSupport { +public class SalesforceComponentVerifierExtensionManualIT extends CamelTestSupport { @Override public boolean isUseRouteBuilder() { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceHeadersIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceHeadersManualIT.java similarity index 95% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceHeadersIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceHeadersManualIT.java index 54388640f97..b2bf7e2aa13 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceHeadersIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceHeadersManualIT.java @@ -24,7 +24,7 @@ import org.apache.camel.component.salesforce.api.dto.GlobalObjects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -public class SalesforceHeadersIntegrationTest extends AbstractSalesforceTestBase { +public class SalesforceHeadersManualIT extends AbstractSalesforceTestBase { @Test public void shouldSendCustomHeaders() { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowTest.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowTest.java index 7f7e8c0b397..8dc7e06d4d7 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assumptions.assumeTrue; -public class SalesforceJwtBearerTokenFlowIntegrationTest extends CamelTestSupport { +public class SalesforceJwtBearerTokenFlowTest extends CamelTestSupport { @Test public void shouldLoginUsingJwtBearerToken() { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiManualIT.java index 4cb56064e94..ce01e930d18 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiManualIT.java @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("standalone") -public class StreamingApiIntegrationTest extends AbstractSalesforceTestBase { +public class StreamingApiManualIT extends AbstractSalesforceTestBase { @Test public void testSubscribeAndReceive() throws Exception { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionManualIT.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionManualIT.java index 020e4e87080..e30ccb8ae1e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionManualIT.java @@ -30,9 +30,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ -public class SessionIntegrationTest implements SalesforceSession.SalesforceSessionListener { +public class SessionManualIT implements SalesforceSession.SalesforceSessionListener { - private static final Logger LOG = LoggerFactory.getLogger(SessionIntegrationTest.class); + private static final Logger LOG = LoggerFactory.getLogger(SessionManualIT.class); private static final int TIMEOUT = 60000; private boolean onLoginTriggered; private boolean onLogoutTriggered; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelperIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelperManualIT.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelperIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelperManualIT.java index 2e8e90f8b0c..8967103566e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelperIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelperManualIT.java @@ -40,7 +40,7 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mockito; import org.slf4j.LoggerFactory; -import static org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelperIntegrationTest.MessageArgumentMatcher.messageForAccountCreationWithName; +import static org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelperManualIT.MessageArgumentMatcher.messageForAccountCreationWithName; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.atLeastOnce; @@ -51,7 +51,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @TestInstance(Lifecycle.PER_CLASS) -public class SubscriptionHelperIntegrationTest { +public class SubscriptionHelperManualIT { final CamelContext camel; final SalesforceEndpointConfig config = new SalesforceEndpointConfig(); @@ -85,9 +85,9 @@ public class SubscriptionHelperIntegrationTest { } } - public SubscriptionHelperIntegrationTest() throws SalesforceException { + public SubscriptionHelperManualIT() throws SalesforceException { server = new StubServer(); - LoggerFactory.getLogger(SubscriptionHelperIntegrationTest.class).info("Port for wireshark to filter: {}", + LoggerFactory.getLogger(SubscriptionHelperManualIT.class).info("Port for wireshark to filter: {}", server.port()); final String instanceUrl = "http://localhost:" + server.port(); server.replyTo( diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/AbstractSalesforceMojoIntegrationTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/AbstractSalesforceMojoTest.java similarity index 98% rename from components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/AbstractSalesforceMojoIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/AbstractSalesforceMojoTest.java index 371d42f7e90..f65ae5433df 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/AbstractSalesforceMojoIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/AbstractSalesforceMojoTest.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; import static org.assertj.core.api.Assertions.assertThat; -public class AbstractSalesforceMojoIntegrationTest { +public abstract class AbstractSalesforceMojoTest { private static final Map<String, List<String>> NO_HEADERS = Collections.emptyMap(); diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoManualIT.java similarity index 95% rename from components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoManualIT.java index 3456266d32a..888a52f358a 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoManualIT.java @@ -34,10 +34,10 @@ import org.apache.camel.component.salesforce.SalesforceEndpointConfig; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.maven.AbstractSalesforceMojoIntegrationTest.setup; +import static org.apache.camel.maven.AbstractSalesforceMojoTest.setup; import static org.assertj.core.api.Assertions.assertThat; -public class CamelSalesforceMojoIntegrationTest { +public class CamelSalesforceMojoManualIT { @TempDir public Path temp; diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/GeneratePubSubMojoIntegrationTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/GeneratePubSubMojoManualIT.java similarity index 96% rename from components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/GeneratePubSubMojoIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/GeneratePubSubMojoManualIT.java index 5649ce5cbac..19ae4db8c6b 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/GeneratePubSubMojoIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/GeneratePubSubMojoManualIT.java @@ -35,10 +35,10 @@ import com.google.testing.compile.JavaFileObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.maven.AbstractSalesforceMojoIntegrationTest.setup; +import static org.apache.camel.maven.AbstractSalesforceMojoTest.setup; import static org.assertj.core.api.Assertions.assertThat; -public class GeneratePubSubMojoIntegrationTest { +public class GeneratePubSubMojoManualIT { private static final String TEST_LOGIN_PROPERTIES = "../test-salesforce-login.properties"; diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoIntegrationTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoManualIT.java similarity index 97% rename from components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoManualIT.java index 5c97479d441..0cdefe1d3ca 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoManualIT.java @@ -26,7 +26,7 @@ import org.littleshoot.proxy.HttpProxyServer; import org.littleshoot.proxy.ProxyAuthenticator; import org.littleshoot.proxy.impl.DefaultHttpProxyServer; -public class HttpProxyMojoIntegrationTest extends CamelSalesforceMojoIntegrationTest { +public class HttpProxyMojoManualIT extends CamelSalesforceMojoManualIT { private static final String HTTP_PROXY_PASSWORD = "camel-user-password"; diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/SchemaMojoIntegrationTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/SchemaMojoManualIT.java similarity index 94% rename from components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/SchemaMojoIntegrationTest.java rename to components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/SchemaMojoManualIT.java index 825d3ec2b08..dc8b3fecba9 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/SchemaMojoIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/SchemaMojoManualIT.java @@ -26,10 +26,10 @@ import org.apache.camel.component.salesforce.api.utils.JsonUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.apache.camel.maven.AbstractSalesforceMojoIntegrationTest.setup; +import static org.apache.camel.maven.AbstractSalesforceMojoTest.setup; import static org.junit.jupiter.api.Assertions.assertTrue; -public class SchemaMojoIntegrationTest { +public class SchemaMojoManualIT { @TempDir public Path temp; diff --git a/components/camel-salesforce/pom.xml b/components/camel-salesforce/pom.xml index 95e5e6a64b0..661233e0e83 100644 --- a/components/camel-salesforce/pom.xml +++ b/components/camel-salesforce/pom.xml @@ -47,6 +47,7 @@ <sourcecheckExcludesComma> ${sourcecheckExcludes}, </sourcecheckExcludesComma> + <skipITs>true</skipITs> </properties> - + </project> diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml index 46d00476b69..f9a488ec7e9 100644 --- a/components/camel-spring-xml/pom.xml +++ b/components/camel-spring-xml/pom.xml @@ -652,7 +652,6 @@ <configuration> <excludes> <exclude>${platform.skip.tests}</exclude> - <exclude>**/*IntegrationTest.java</exclude> </excludes> </configuration> </plugin> diff --git a/parent/pom.xml b/parent/pom.xml index fa2fdcf54eb..f0ea047763e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3498,7 +3498,7 @@ <include>**/*Test.java</include> </includes> <excludes> - <exclude>**/*IntegrationTest.java</exclude> + <exclude>**/*IT.java</exclude> <exclude>**/*XXXTest.*</exclude> </excludes> <forkCount>${camel.surefire.forkCount}</forkCount>