Merge pull request #1286 from ashitsalesforce/master

command options based proxy username/password in tests

runtests.sh

@@ -34,7 +34,7 @@ do
       debug="-Dmaven.surefire.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=0.0.0.0:5005"
       ;;
     D)
-     debugEncryption="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=0.0.0.0:5005,suspend=y"   
+      debugEncryption="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=0.0.0.0:5005,suspend=y"   
       ;;
     t)
       test="-Dskip-unit-tests=true -Dtest=com.salesforce.dataloader.${OPTARG}"
@@ -74,9 +74,18 @@ jarname="$(find ./target -name 'dataloader-[0-9][0-9].[0-9].[0-9].jar' | tail -1
 #echo "password = ${4}"
 encryptedPassword="$(java ${debugEncryption} -cp ${jarname} com.salesforce.dataloader.process.DataLoaderRunner run.mode=encrypt -e ${4} ${encryptionFile} | tail -1)"
 
+additionalOptions=""
+for option in $@
+do
+    if [[ ${option} == -D* ]]; then
+        additionalOptions+=" "
+        additionalOptions+=${option}
+    fi
+done
+
 # uncomment the following lines to debug issues with password encryption
 #echo "encryptedPassword = ${encryptedPassword}"
 #decryptedPassword="$(java ${debugEncryption} -cp ${jarname} com.salesforce.dataloader.process.DataLoaderRunner run.mode=encrypt -d ${encryptedPassword} ${encryptionFile} | tail -1)"
 #echo "decryptedPassword = ${decryptedPassword}"
 
-mvn ${failfast} -Dtest.endpoint=${1} -Dtest.user.default=${2} -Dtest.user.restricted=${3} -Dtest.password=${encryptedPassword} -Dtest.encryptionFile=${encryptionFile} verify ${debug} ${test}
+mvn ${failfast} -Dtest.endpoint=${1} -Dtest.user.default=${2} -Dtest.user.restricted=${3} -Dtest.password=${encryptedPassword} -Dtest.encryptionFile=${encryptionFile} verify ${debug} ${test} ${additionalOptions}

src/test/java/com/salesforce/dataloader/ConfigTestBase.java

@@ -74,6 +74,12 @@ protected Map<String, String> getTestConfig() {
             prop.putConfigSetting(configBase);
         }
         configBase.put(AppUtil.CLI_OPTION_CONFIG_DIR_PROP, TEST_CONF_DIR);
+        String proxyUsername = System.getProperty(Config.PROXY_USERNAME);
+        String proxyPassword = System.getProperty(Config.PROXY_PASSWORD);
+        if (proxyUsername != null && proxyPassword != null) {
+            configBase.put(Config.PROXY_USERNAME, proxyUsername);
+            configBase.put(Config.PROXY_PASSWORD, proxyPassword);
+        }
         return configBase;
     }