[camel] branch master updated: Camel-Salesforce: Fix - Integration tests ignore salesforce endpoint setting.

[zregvart]

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 d83aa63  Camel-Salesforce: Fix - Integration tests ignore salesforce 
endpoint setting.
d83aa63 is described below

commit d83aa63c5e4a044bfba4320061b81a6ab580dc6c
Author: Jeremy Ross <jer...@jeremyross.org>
AuthorDate: Mon Aug 5 14:44:26 2019 -0500

    Camel-Salesforce: Fix - Integration tests ignore salesforce endpoint 
setting.
---
 .../camel-salesforce/camel-salesforce-component/pom.xml      | 12 +++++++++++-
 .../apache/camel/component/salesforce/LoginConfigHelper.java |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml 
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 395e13a..2932aee 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -367,6 +367,11 @@ 
https://developer.salesforce.com/page/Force.com_Migration_Tool]]></message>
                                         <property name="password" 
value="${env.SALESFORCE_PASSWORD}"
                                                   
if:set="env.SALESFORCE_PASSWORD"/>
 
+                                        <property name="serverurl" 
value="${prop.salesforce.login.url}"
+                                                  
if:set="prop.salesforce.login.url"/>
+                                        <property name="serverurl" 
value="${env.SALESFORCE_LOGIN_URL}"
+                                                  
if:set="env.SALESFORCE_LOGIN_URL"/>
+
                                         <fail unless:set="username" 
message="To run the migrations you need to specify either `salesforce.username`
 in: 
${project.build.directory}/generated-resources/test-salesforce-login.properties
 or set SALESFORCE_USERNAME environment variable"/>
@@ -375,10 +380,15 @@ or set SALESFORCE_USERNAME environment variable"/>
 in: 
${project.build.directory}/generated-resources/test-salesforce-login.properties
 or set SALESFORCE_PASSWORD environment variable"/>
 
+                                        <fail unless:set="serverurl" 
message="To run the migrations you need to specify either `salesforce.login.url`
+in: 
${project.build.directory}/generated-resources/test-salesforce-login.properties
+or set SALESFORCE_LOGIN_URL environment variable"/>
+
                                         <sf:deploy 
xmlns:sf="antlib:com.salesforce" username="${username}"
                                                    password="${password}"
                                                    
deployRoot="${salesforce.component.root}/it/resources/salesforce"
-                                                   rollbackOnError="true"/>
+                                                   rollbackOnError="true"
+                                                   serverurl="${serverurl}" />
                                     </target>
                                 </configuration>
                             </execution>
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
index 140feed..1f0b51c 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
@@ -60,6 +60,10 @@ public final class LoginConfigHelper {
         if (ObjectHelper.isNotEmpty(explicitType)) {
             loginConfig.setType(AuthenticationType.valueOf(explicitType));
         }
+        final String loginUrl = configuration.get("salesforce.login.url");
+        if (ObjectHelper.isNotEmpty(loginUrl)) {
+            loginConfig.setLoginUrl(loginUrl);
+        }
         loginConfig.setClientId(configuration.get("salesforce.client.id"));
         
loginConfig.setClientSecret(configuration.get("salesforce.client.secret"));
         loginConfig.setUserName(configuration.get("salesforce.username"));