This is an automated email from the ASF dual-hosted git repository.
zregvart 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 77cd2e4 camel-salesforce: Fix integration tests.
77cd2e4 is described below
commit 77cd2e48beed055be9bb4f137611f558ce6fdf87
Author: Jeremy Ross <jer...@jeremyross.org>
AuthorDate: Wed Nov 18 12:36:52 2020 -0600
camel-salesforce: Fix integration tests.
---
.../salesforce/ApprovalIntegrationTest.java | 6 +--
.../CompositeApiBatchIntegrationTest.java | 22 ++++-----
.../salesforce/RestApiIntegrationTest.java | 56 +++++++++++-----------
.../System Administrator With Hard Delete.profile | 20 ++++----
4 files changed, 55 insertions(+), 49 deletions(-)
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/ApprovalIntegrationTest.java
index bf7c57b..a958162 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/ApprovalIntegrationTest.java
@@ -59,8 +59,8 @@ public class ApprovalIntegrationTest extends
AbstractApprovalIntegrationTest {
assertEquals(1, approvalResult.size(), "There should be one Account
waiting approval");
- assertEquals("Instance status of the item in approval result should be
`Pending`", "Pending",
- approvalResult.iterator().next().getInstanceStatus());
+ assertEquals("Pending",
approvalResult.iterator().next().getInstanceStatus(),
+ "Instance status of the item in approval result should be
`Pending`");
// as it stands on 18.11.2016. the GET method on
// /vXX.X/process/approvals/ with Accept other than
@@ -75,7 +75,7 @@ public class ApprovalIntegrationTest extends
AbstractApprovalIntegrationTest {
}
@Test
- public void shouldSubmitBulkApprovals(String format) {
+ public void shouldSubmitBulkApprovals() {
final List<ApprovalRequest> approvalRequests =
accountIds.stream().map(id -> {
final ApprovalRequest request = new ApprovalRequest();
request.setContextId(id);
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 b3744ef..270f017 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
@@ -68,16 +68,12 @@ public class CompositeApiBatchIntegrationTest extends
AbstractSalesforceTestBase
= new
HashSet<>(Arrays.asList(SalesforceEndpointConfig.DEFAULT_VERSION, "34.0",
"36.0", "37.0", "39.0"));
@Parameter
- private final String version;
+ protected String format;
- private String accountId;
-
- private final String batchuri;
+ @Parameter(1)
+ protected String version;
- public CompositeApiBatchIntegrationTest(String format, String version) {
- this.version = version;
- batchuri = "salesforce:composite-batch?format=" + format;
- }
+ private String accountId;
@AfterEach
public void removeRecords() {
@@ -101,7 +97,7 @@ public class CompositeApiBatchIntegrationTest extends
AbstractSalesforceTestBase
}
@Test
- public void shouldSubmitBatchUsingCompositeApi(String format, String
version) {
+ public void shouldSubmitBatchUsingCompositeApi() {
final SObjectBatch batch = new SObjectBatch(version);
final Account updates = new Account();
@@ -116,7 +112,7 @@ public class CompositeApiBatchIntegrationTest extends
AbstractSalesforceTestBase
batch.addDelete("Account", accountId);
- final SObjectBatchResponse response = template.requestBody(batchuri,
batch, SObjectBatchResponse.class);
+ final SObjectBatchResponse response = template.requestBody(batchUri(),
batch, SObjectBatchResponse.class);
assertNotNull(response, "Response should be provided");
@@ -389,7 +385,7 @@ public class CompositeApiBatchIntegrationTest extends
AbstractSalesforceTestBase
}
SObjectBatchResponse testBatch(final SObjectBatch batch) {
- final SObjectBatchResponse response = template.requestBody(batchuri,
batch, SObjectBatchResponse.class);
+ final SObjectBatchResponse response = template.requestBody(batchUri(),
batch, SObjectBatchResponse.class);
assertNotNull(response, "Response should be provided");
@@ -402,4 +398,8 @@ public class CompositeApiBatchIntegrationTest extends
AbstractSalesforceTestBase
public static Iterable<Object[]> formats() {
return VERSIONS.stream().map(v -> new Object[] { "JSON", v
}).collect(Collectors.toList());
}
+
+ private String batchUri() {
+ return "salesforce:composite-batch?format=" + format;
+ }
}
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/RestApiIntegrationTest.java
index abb0299..a1eb9c0 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/RestApiIntegrationTest.java
@@ -53,6 +53,7 @@ import
org.apache.camel.component.salesforce.dto.generated.Task;
import org.apache.camel.support.jsse.SSLContextParameters;
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.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
@@ -180,7 +181,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testApexCall(String format) throws Exception {
+ public void testApexCall() throws Exception {
// request merchandise with id in URI template
Merchandise__c merchandise
= template().requestBodyAndHeader("direct:apexCallGet", null,
"id", merchandiseId, Merchandise__c.class);
@@ -204,7 +205,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testCreateUpdateDelete(String format) throws Exception {
+ public void testCreateUpdateDelete() throws Exception {
final Merchandise__c merchandise = new Merchandise__c();
merchandise.setName("Wee Wee Wee Plane");
merchandise.setDescription__c("Microlite plane");
@@ -231,7 +232,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testRelationshipCreateDelete(String format) throws Exception {
+ public void testRelationshipCreateDelete() throws Exception {
final Account account = new Account();
account.setName("Account 1");
String accountExternalId = UUID.randomUUID().toString();
@@ -259,7 +260,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testFieldsToNull(String format) throws Exception {
+ public void testFieldsToNull() throws Exception {
final Account account = new Account();
account.setName("Account 1");
account.setSite("test site");
@@ -285,7 +286,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testRelationshipUpdate(String format) throws Exception {
+ public void testRelationshipUpdate() throws Exception {
final Contact contact = new Contact();
contact.setLastName("RelationshipTest");
final CreateSObjectResult contactResult
@@ -319,7 +320,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testCreateUpdateDeleteTasks(String format) throws Exception {
+ public void testCreateUpdateDeleteTasks() throws Exception {
final Task taken = new Task();
taken.setDescription("Task1");
taken.setActivityDate(ZonedDateTime.of(1700, 1, 2, 3, 4, 5, 6,
ZoneId.systemDefault()));
@@ -340,7 +341,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testCreateUpdateDeleteWithId(String format) throws Exception {
+ public void testCreateUpdateDeleteWithId() throws Exception {
Line_Item__c lineItem = new Line_Item__c();
final String lineItemId =
String.valueOf(TEST_LINE_ITEM_ID.incrementAndGet());
lineItem.setName(lineItemId);
@@ -380,7 +381,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testGetBasicInfo(String format) throws Exception {
+ public void testGetBasicInfo() throws Exception {
final SObjectBasicInfo objectBasicInfo =
template().requestBody("direct:getBasicInfo", null, SObjectBasicInfo.class);
assertNotNull(objectBasicInfo);
@@ -390,7 +391,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testGetBlobField(String format) throws Exception {
+ public void testGetBlobField() throws Exception {
// get document with Name "Test Document"
final HashMap<String, Object> headers = new HashMap<>();
headers.put(SalesforceEndpointConfig.SOBJECT_NAME, "Document");
@@ -407,26 +408,26 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testGetDescription(String format) throws Exception {
+ public void testGetDescription() throws Exception {
final SObjectDescription sObjectDescription
= template().requestBody("direct:getDescription", null,
SObjectDescription.class);
assertNotNull(sObjectDescription);
}
@Test
- public void testGetGlobalObjects(String format) throws Exception {
+ public void testGetGlobalObjects() throws Exception {
final GlobalObjects globalObjects =
template().requestBody("direct:getGlobalObjects", null, GlobalObjects.class);
assertNotNull(globalObjects);
}
@Test
- public void testGetResources(String format) throws Exception {
+ public void testGetResources() throws Exception {
final RestResources resources =
template().requestBody("direct:getResources", null, RestResources.class);
assertNotNull(resources);
}
@Test
- public void testGetSObject(String format) throws Exception {
+ public void testGetSObject() throws Exception {
final Merchandise__c merchandise =
template().requestBody("direct:getSObject", merchandiseId,
Merchandise__c.class);
assertNotNull(merchandise);
@@ -435,7 +436,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testGetVersions(String format) throws Exception {
+ public void testGetVersions() throws Exception {
// test getVersions doesn't need a body
// assert expected result
final Object o = template().requestBody("direct:getVersions", (Object)
null);
@@ -451,14 +452,14 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testQuery(String format) throws Exception {
+ public void testQuery() throws Exception {
final QueryRecordsLine_Item__c queryRecords
= template().requestBody("direct:query", null,
QueryRecordsLine_Item__c.class);
assertNotNull(queryRecords);
}
@Test
- public void testParentRelationshipQuery(String format) throws Exception {
+ public void testParentRelationshipQuery() throws Exception {
try {
createAccountAndContact();
final QueryRecordsContact queryRecords
@@ -471,7 +472,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testChildRelationshipQuery(String format) throws Exception {
+ public void testChildRelationshipQuery() throws Exception {
try {
createAccountAndContact();
final QueryRecordsAccount queryRecords
@@ -486,14 +487,14 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testQueryAll(String format) throws Exception {
+ public void testQueryAll() throws Exception {
final QueryRecordsLine_Item__c queryRecords
= template().requestBody("direct:queryAll", null,
QueryRecordsLine_Item__c.class);
assertNotNull(queryRecords);
}
@Test
- public void testRetry(String format) throws Exception {
+ public void testRetry() throws Exception {
final SalesforceComponent sf = context().getComponent("salesforce",
SalesforceComponent.class);
final String accessToken = sf.getSession().getAccessToken();
@@ -509,11 +510,11 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
final ContentResponse response = logoutGet.send();
assertEquals(HttpStatus.OK_200, response.getStatus());
- testGetGlobalObjects(format);
+ testGetGlobalObjects();
}
@Test
- public void testRetryFailure(String format) throws Exception {
+ public void testRetryFailure() throws Exception {
final SalesforceComponent sf = context().getComponent("salesforce",
SalesforceComponent.class);
final String accessToken = sf.getSession().getAccessToken();
@@ -535,7 +536,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
sf.getLoginConfig().setPassword("bad_password");
try {
- testGetGlobalObjects(format);
+ testGetGlobalObjects();
fail("Expected CamelExecutionException!");
} catch (final CamelExecutionException e) {
if (e.getCause() instanceof SalesforceException) {
@@ -551,14 +552,14 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testSearch(String format) throws Exception {
+ public void testSearch() throws Exception {
final Object obj = template().requestBody("direct:search", (Object)
null);
assertNotNull(obj);
}
@Test
- public void testStatus300(String format) throws Exception {
+ public void testStatus300() throws Exception {
// get test merchandise
// note that the header value overrides sObjectFields in endpoint
final Merchandise__c merchandise =
template().requestBodyAndHeader("direct:getSObject", merchandiseId,
"sObjectFields",
@@ -600,7 +601,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testStatus400(String format) throws Exception {
+ public void testStatus400() throws Exception {
// get test merchandise
// note that the header value overrides sObjectFields in endpoint
final Merchandise__c merchandise =
template().requestBodyAndHeader("direct:getSObject", merchandiseId,
"sObjectFields",
@@ -631,7 +632,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testStatus404(String format) throws Exception {
+ public void testStatus404() throws Exception {
// try to get a non existent SObject
try {
template().requestBody("direct:getSObject", "ILLEGAL_ID",
Merchandise__c.class);
@@ -646,7 +647,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
}
@Test
- public void testFetchingGlobalObjects(String format) throws Exception {
+ public void testFetchingGlobalObjects() throws Exception {
final GlobalObjects globalObjects =
template().requestBody("salesforce:getGlobalObjects", null,
GlobalObjects.class);
assertNotNull(globalObjects);
@@ -757,6 +758,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
};
}
+ @Parameters
public static Iterable<String> parameters() {
return Arrays.asList("XML", "JSON");
}
diff --git
a/components/camel-salesforce/it/resources/salesforce/profiles/System
Administrator With Hard Delete.profile
b/components/camel-salesforce/it/resources/salesforce/profiles/System
Administrator With Hard Delete.profile
index 6729c8a..8d10c52 100644
--- a/components/camel-salesforce/it/resources/salesforce/profiles/System
Administrator With Hard Delete.profile
+++ b/components/camel-salesforce/it/resources/salesforce/profiles/System
Administrator With Hard Delete.profile
@@ -216,10 +216,6 @@
</userPermissions>
<userPermissions>
<enabled>true</enabled>
- <name>CreatePackaging</name>
- </userPermissions>
- <userPermissions>
- <enabled>true</enabled>
<name>CreateReportFolders</name>
</userPermissions>
<userPermissions>
@@ -344,10 +340,6 @@
</userPermissions>
<userPermissions>
<enabled>true</enabled>
- <name>InstallPackaging</name>
- </userPermissions>
- <userPermissions>
- <enabled>true</enabled>
<name>LightningExperienceUser</name>
</userPermissions>
<userPermissions>
@@ -364,6 +356,18 @@
</userPermissions>
<userPermissions>
<enabled>true</enabled>
+ <name>ViewDataLeakageEvents</name>
+ </userPermissions>
+ <userPermissions>
+ <enabled>true</enabled>
+ <name>ViewPlatformEvents</name>
+ </userPermissions>
+ <userPermissions>
+ <enabled>true</enabled>
+ <name>CreatePackaging</name>
+ </userPermissions>
+ <userPermissions>
+ <enabled>true</enabled>
<name>ManageCallCenters</name>
</userPermissions>
<userPermissions>
