You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by je...@apache.org on 2022/04/17 21:55:43 UTC
[camel] branch main updated: CAMEL-17954: Fix integration tests
This is an automated email from the ASF dual-hosted git repository.
jeremyross 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 17e09dc2fdd CAMEL-17954: Fix integration tests
17e09dc2fdd is described below
commit 17e09dc2fdd0dfbe5c9fa661e178cc308d9b5d05
Author: Jeremy Ross <je...@gmail.com>
AuthorDate: Sun Apr 17 16:54:10 2022 -0500
CAMEL-17954: Fix integration tests
---
.../camel-salesforce-component/pom.xml | 1 +
.../salesforce/AbstractSalesforceTestBase.java | 2 ++
.../BulkApiV2QueryJobIntegrationTest.java | 2 +-
.../CompositeApiBatchIntegrationTest.java | 35 +++++++++++-----------
...eComponentVerifierExtensionIntegrationTest.java | 1 +
.../camel/maven/SchemaMojoIntegrationTest.java | 2 +-
6 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 9b24b2190cc..3fef64277fa 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -429,6 +429,7 @@ https://developer.salesforce.com/page/Force.com_Migration_Tool]]></message>
<include>**/*IntegrationTest.java</include>
</includes>
<excludedGroups>standalone</excludedGroups>
+ <forkedProcessExitTimeoutInSeconds>240</forkedProcessExitTimeoutInSeconds>
</configuration>
</execution>
<execution>
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
index 1772fd49f04..40246fc91dc 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
@@ -60,6 +60,8 @@ public abstract class AbstractSalesforceTestBase extends CamelTestSupport {
clientProperties.put("maxContentLength", String.valueOf(4 * 1024 * 1024));
component.setHttpClientProperties(clientProperties);
+ component.setHttpClientIdleTimeout(60000);
+
// set DTO package
component.setPackages(Merchandise__c.class.getPackage().getName());
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/BulkApiV2QueryJobIntegrationTest.java
index ad969f4fc50..ceb29d0e42c 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/BulkApiV2QueryJobIntegrationTest.java
@@ -159,7 +159,7 @@ public class BulkApiV2QueryJobIntegrationTest extends AbstractSalesforceTestBase
int i = 0;
while (job.getState() != JobStateEnum.JOB_COMPLETE) {
i++;
- if (i == 5) {
+ if (i == 10) {
throw new IllegalStateException("Job failed to reach JOB_COMPLETE status.");
}
Thread.sleep(2000);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java
index e009a2f97ca..6fdc2d14668 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java
@@ -24,10 +24,9 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
-import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
+import org.apache.camel.component.salesforce.api.dto.UpsertSObjectResult;
import org.apache.camel.component.salesforce.api.dto.composite.SObjectBatch;
import org.apache.camel.component.salesforce.api.dto.composite.SObjectBatch.Method;
import org.apache.camel.component.salesforce.api.dto.composite.SObjectBatchResponse;
@@ -38,7 +37,6 @@ import org.apache.camel.test.junit5.params.Parameter;
import org.apache.camel.test.junit5.params.Parameterized;
import org.apache.camel.test.junit5.params.Parameters;
import org.apache.camel.test.junit5.params.Test;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -53,7 +51,9 @@ public class CompositeApiBatchIntegrationTest extends AbstractSalesforceTestBase
}
private static final Set<String> VERSIONS
- = new HashSet<>(Arrays.asList(SalesforceEndpointConfig.DEFAULT_VERSION, "34.0", "36.0", "37.0", "39.0"));
+ = new HashSet<>(Arrays.asList(SalesforceEndpointConfig.DEFAULT_VERSION, "34.0"));
+
+ private static final String ACCOUNT_EXTERNAL_ID = "CompositeAPIBatch";
@Parameter
protected String format;
@@ -63,25 +63,24 @@ public class CompositeApiBatchIntegrationTest extends AbstractSalesforceTestBase
private String accountId;
- @AfterEach
- public void removeRecords() {
- try {
- template.sendBody("salesforce:deleteSObject?sObjectName=Account&sObjectId=" + accountId, null);
- } catch (final CamelExecutionException ignored) {
- // other tests run in parallel could have deleted the Account
+ @BeforeEach
+ public void setupRecords() throws InterruptedException {
+ if (accountId != null) {
+ return;
}
- template.request("direct:deleteBatchAccounts", null);
- }
-
- @BeforeEach
- public void setupRecords() {
final Account account = new Account();
account.setName("Composite API Batch");
+ account.setExternal_Id__c(ACCOUNT_EXTERNAL_ID);
- final CreateSObjectResult result = template.requestBody("salesforce:createSObject", account, CreateSObjectResult.class);
-
+ final UpsertSObjectResult result = template.requestBody(
+ "salesforce:upsertSObject?sObjectIdName=External_Id__c&apiVersion=53.0", account, UpsertSObjectResult.class);
accountId = result.getId();
+
+ if (result.getCreated()) {
+ // Give the indexer some time to index this account
+ Thread.sleep(2000);
+ }
}
@Test
@@ -298,7 +297,7 @@ public class CompositeApiBatchIntegrationTest extends AbstractSalesforceTestBase
// asynchronously to object creation, so that account might not be
// indexed at this time, so we search for
// `United` Account that should be created with developer instance
- batch.addSearch("FIND {United} IN Name Fields RETURNING Account (Name)");
+ batch.addSearch("FIND {Composite API Batch} IN Name Fields RETURNING Account (Name)");
final SObjectBatchResponse response = testBatch(batch);
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/SalesforceComponentVerifierExtensionIntegrationTest.java
index 5bc7266f37b..801ea7c78d6 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/SalesforceComponentVerifierExtensionIntegrationTest.java
@@ -49,6 +49,7 @@ public class SalesforceComponentVerifierExtensionIntegrationTest extends CamelTe
parameters.put("clientSecret", loginConfig.getClientSecret());
parameters.put("userName", loginConfig.getUserName());
parameters.put("password", loginConfig.getPassword());
+ parameters.put("loginUrl", loginConfig.getLoginUrl());
return parameters;
}
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/SchemaMojoIntegrationTest.java
index 2d4bda96a7c..9f9bd2962d9 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/SchemaMojoIntegrationTest.java
@@ -40,7 +40,7 @@ public class SchemaMojoIntegrationTest {
setup(mojo);
mojo.includes = new String[] { "Account" };
- mojo.outputDirectory = temp.getRoot().toFile();
+ mojo.outputDirectory = temp.toFile();
mojo.jsonSchemaFilename = "test-schema.json";
mojo.jsonSchemaId = JsonUtils.DEFAULT_ID_PREFIX;