Merge pull request #28 from Jonahss/master

Update to 1.2.0

Author: Jonahss

README.md

@@ -47,6 +47,8 @@ More can be found in the docs, but here's a quick list of features which this pr
 - lockScreen()
 - shake()
 - complexFind()
+- scrollTo()
+- scrollToExact()
 - Context Switching: .context(), .getContextHandles(), getContext())
 
 Locators:
@@ -58,6 +60,9 @@ Locators:
 - findElementsByAndroidUIAutomator()
 
 ##Changelog##
+*1.2.0*
+- complexFind() now returns MobileElement objects
+- added scrollTo() and scrollToExact() methods for use with complexFind()
 *1.1.0*
 - AppiumDriver now implements Rotatable. rotate() and getOrientation() methods added
 - when no appium server is running, the proper error is thrown, instead of a NullPointerException

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.appium</groupId>
     <artifactId>java-client</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <dependencies>
         <dependency>
             <groupId>com.google.collections</groupId>

src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java

@@ -1,6 +1,5 @@
 package io.appium.java_client;
 
-import org.apache.commons.codec.binary.Base64;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -89,12 +88,4 @@ public void ErrorTest() {
     driver.findElementByAndroidUIAutomator(null);
   }
 
-  @Test
-  public void pushFileTest() {
-    byte[] data = Base64.encodeBase64("The eventual code is no more than the deposit of your understanding. ~E. W. Dijkstra".getBytes());
-    driver.pushFile("/data/local/tmp/remote.txt", data);
-    byte[] returnData = driver.pullFile("/data/local/tmp/remote.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);
-  }
 }

src/test/java/io/appium/java_client/MobileDriverAndroidTest.java

@@ -17,6 +17,7 @@
 
 package io.appium.java_client;
 
+import org.apache.commons.codec.binary.Base64;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -95,4 +96,13 @@ public void closeAppTest() throws InterruptedException {
     driver.launchApp();
     assertEquals(".ApiDemos", driver.currentActivity());
   }
+
+  @Test
+  public void pushFileTest() {
+    byte[] data = Base64.encodeBase64("The eventual code is no more than the deposit of your understanding. ~E. W. Dijkstra".getBytes());
+    driver.pushFile("/data/local/tmp/remote.txt", data);
+    byte[] returnData = driver.pullFile("/data/local/tmp/remote.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);
+  }
 }