The additional method pushFile(remotePath, file)

TikhomirovSergey · TikhomirovSergey · commit ab041b1e8a87 · 2016-05-14T22:11:23.000+03:00
It is the minor change
This method was added for the sake of user's convenience.
diff --git a/src/main/java/io/appium/java_client/android/AndroidDriver.java b/src/main/java/io/appium/java_client/android/AndroidDriver.java
@@ -17,6 +17,7 @@
 package io.appium.java_client.android;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 import static io.appium.java_client.MobileCommand.CURRENT_ACTIVITY;
 import static io.appium.java_client.MobileCommand.END_TEST_COVERAGE;
 import static io.appium.java_client.MobileCommand.GET_NETWORK_CONNECTION;
@@ -42,13 +43,17 @@
 import io.appium.java_client.remote.MobilePlatform;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.http.HttpClient;
 
+import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 
@@ -284,17 +289,22 @@ static String uiScrollable(String uiSelector) {
         execute(SET_NETWORK_CONNECTION, getCommandImmutableMap(parameters, values));
     }
 
-    /**
-     * @param remotePath Path to file to write data to on remote device.
-     * @param base64Data Base64 encoded byte array of data to write to remote device.
-     * @see PushesFiles#pushFile(String, byte[])
-     */
     @Override public void pushFile(String remotePath, byte[] base64Data) {
         String[] parameters = new String[] {"path", "data"};
         Object[] values = new Object[] {remotePath, base64Data};
         execute(PUSH_FILE, getCommandImmutableMap(parameters, values));
     }
 
+    @Override public void pushFile(String remotePath, File file) throws IOException {
+        checkNotNull(file, "A reference to file should not be NULL");
+        if (!file.exists()) {
+            throw new IOException("The given file "
+                + file.getAbsolutePath() + " doesn't exist");
+        }
+        pushFile(remotePath,
+            Base64.encodeBase64(FileUtils.readFileToByteArray(file)));
+    }
+
     @Override public void startActivity(String appPackage, String appActivity,
                                         String appWaitPackage,
                                         String appWaitActivity, String intentAction,
diff --git a/src/main/java/io/appium/java_client/android/PushesFiles.java b/src/main/java/io/appium/java_client/android/PushesFiles.java
@@ -18,14 +18,26 @@
 
 import io.appium.java_client.InteractsWithFiles;
 
+import java.io.File;
+import java.io.IOException;
+
 public interface PushesFiles extends InteractsWithFiles {
 
     /**
-     * Save base64 encoded data as a file on the remote mobile device.
+     * Saves base64 encoded data as a file on the remote mobile device.
      *
      * @param remotePath Path to file to write data to on remote device
      * @param base64Data Base64 encoded byte array of data to write to remote device
      */
     void pushFile(String remotePath, byte[] base64Data);
 
+    /**
+     * Saves given file as a file on the remote mobile device.
+     *
+     * @param remotePath Path to file to write data to on remote device
+     * @param file is a file to write to remote device
+     * @throws IOException when there are problems with a file or current file system
+     */
+    void pushFile(String remotePath, File file) throws IOException;
+
 }
diff --git a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
@@ -22,10 +22,13 @@
 
 import io.appium.java_client.AppiumSetting;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.openqa.selenium.ScreenOrientation;
 import org.openqa.selenium.html5.Location;
 
+import java.io.File;
+
 public class AndroidDriverTest extends BaseAndroidTest {
 
     @Test public void getDeviceTimeTest() {
@@ -59,6 +62,23 @@ public class AndroidDriverTest extends BaseAndroidTest {
             returnDataDecoded);
     }
 
+    @Test public void pushTempFileTest() throws Exception {
+        File temp = File.createTempFile("Temp_", "_test");
+        try {
+            FileUtils.writeStringToFile(temp, "The eventual code is no "
+                + "more than the deposit of your understanding. ~E. W. Dijkstra", "UTF-8", true);
+            driver.pushFile("/data/local/tmp/remote2.txt", temp);
+            byte[] returnData = driver.pullFile("/data/local/tmp/remote2.txt");
+            String returnDataDecoded = new String(Base64.decodeBase64(returnData));
+            assertEquals(
+                "The eventual code is no more than the deposit of "
+                    + "your understanding. ~E. W. Dijkstra",
+                returnDataDecoded);
+        } finally {
+            FileUtils.forceDelete(temp);
+        }
+    }
+
     @Test public void ignoreUnimportantViews() {
         driver.ignoreUnimportantViews(true);
         boolean ignoreViews =
