Merge branch 'master' of https://github.com/appium/java-client

prattpratt · prattpratt · commit c485fa56483b · 2014-08-06T19:22:57.000+03:00
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Depends upon the Selenium Java client library, available [here](http://docs.sele
 <dependency>
   <groupId>io.appium</groupId>
   <artifactId>java-client</artifactId>
-  <version>1.5.0</version>
+  <version>1.6.1</version>
 </dependency>
 ```
 
@@ -61,6 +61,13 @@ Locators:
 - findElementsByAndroidUIAutomator()
 
 ##Changelog##
+*1.6.1*
+- Fixed the logic for checking connection status on NetworkConnectionSetting objects
+
+*1.6.0*
+- Added @findBy annotations. Explanation here: https://github.com/appium/java-client/pull/68 Thanks to TikhomirovSergey
+- Appium Driver now implements LocationContext interface, so setLocation() works for setting GPS coordinates
+
 *1.5.0*
 - Added MobileCapabilityType enums for desired capabilities
 - `findElement` and `findElements` return MobileElement objects (still need to be casted, but no longer instantiated)
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.appium</groupId>
     <artifactId>java-client</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.1</version>
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -21,7 +21,10 @@
 import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.internal.JsonToMobileElementConverter;
 import org.openqa.selenium.*;
+import org.openqa.selenium.html5.Location;
+import org.openqa.selenium.html5.LocationContext;
 import org.openqa.selenium.remote.*;
+import org.openqa.selenium.remote.html5.RemoteLocationContext;
 
 import javax.xml.bind.DatatypeConverter;
 import java.net.URL;
@@ -33,19 +36,23 @@
 import static io.appium.java_client.MobileCommand.*;
 
 public class AppiumDriver extends RemoteWebDriver implements MobileDriver, ContextAware, Rotatable, FindsByIosUIAutomation,
-        FindsByAndroidUIAutomator, FindsByAccessibilityId {
+        FindsByAndroidUIAutomator, FindsByAccessibilityId, LocationContext {
 
   private final static ErrorHandler errorHandler = new ErrorHandler(new ErrorCodesMobile(), true);
   private URL remoteAddress;
   private ComplexFind complexFind;
+  private RemoteLocationContext locationContext;
+  private ExecuteMethod executeMethod;
 
   public AppiumDriver(URL remoteAddress, Capabilities desiredCapabilities){
 
     super(remoteAddress, desiredCapabilities);
     this.setElementConverter(new JsonToMobileElementConverter(this));
 
+    this.executeMethod = new AppiumExecutionMethod(this);
     this.remoteAddress = remoteAddress;
     complexFind = new ComplexFind(this);
+    locationContext = new RemoteLocationContext(executeMethod);
 
     ImmutableMap.Builder<String, CommandInfo> builder = ImmutableMap.builder();
     builder
@@ -93,6 +100,10 @@ protected Response execute(String command) {
     return execute(command, ImmutableMap.<String, Object>of());
   }
 
+  @Override
+  public ExecuteMethod getExecuteMethod() {
+    return executeMethod;
+  }
 
   /**
    * Reset the currently running app for this session
@@ -626,6 +637,16 @@ public List<WebElement> findElementsByAccessibilityId(String using) {
     return findElements("accessibility id", using);
   }
 
+  @Override
+  public Location location() {
+    return locationContext.location();
+  }
+
+  @Override
+  public void setLocation(Location location) {
+    locationContext.setLocation(location);
+  }
+
   private TouchAction createTap(WebElement element, int duration) {
     TouchAction tap = new TouchAction(this);
     return tap.press(element).waitAction(duration).release();
diff --git a/src/main/java/io/appium/java_client/AppiumExecutionMethod.java b/src/main/java/io/appium/java_client/AppiumExecutionMethod.java
@@ -0,0 +1,27 @@
+package io.appium.java_client;
+
+import com.google.common.collect.ImmutableMap;
+import org.openqa.selenium.remote.ExecuteMethod;
+import org.openqa.selenium.remote.Response;
+
+import java.util.Map;
+
+public class AppiumExecutionMethod implements ExecuteMethod {
+  private final AppiumDriver driver;
+
+  public AppiumExecutionMethod(AppiumDriver driver) {
+    this.driver = driver;
+  }
+
+  public Object execute(String commandName, Map<String, ?> parameters) {
+    Response response;
+
+    if (parameters == null || parameters.isEmpty()) {
+      response = driver.execute(commandName, ImmutableMap.<String, Object>of());
+    } else {
+      response = driver.execute(commandName, parameters);
+    }
+
+    return response.getValue();
+  }
+}
diff --git a/src/main/java/io/appium/java_client/NetworkConnectionSetting.java b/src/main/java/io/appium/java_client/NetworkConnectionSetting.java
@@ -34,11 +34,11 @@ public NetworkConnectionSetting(int bitmask) {
     value = bitmask;
   }
 
-  public boolean airplaneModeEnabled() { return (value & airplaneMode) == 1; }
+  public boolean airplaneModeEnabled() { return (value & airplaneMode) != 0; }
 
-  public boolean wifiEnabled() { return (value & wifi) == 1; }
+  public boolean wifiEnabled() { return (value & wifi) != 0; }
 
-  public boolean dataEnabled() { return (value & data) == 1; }
+  public boolean dataEnabled() { return (value & data) != 0; }
 
   public void setAirplaneMode(boolean enable) {
     if (enable) {
diff --git a/src/test/java/io/appium/java_client/AndroidGestureTest.java b/src/test/java/io/appium/java_client/AndroidGestureTest.java
@@ -17,19 +17,20 @@
 
 package io.appium.java_client;
 
-import static org.junit.Assert.*;
 import io.appium.java_client.remote.MobileCapabilityType;
-
-import java.io.File;
-import java.net.URL;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import java.io.File;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 /**
  * Test Mobile Driver features
  */
@@ -83,7 +84,8 @@ public void dragNDropTest() {
   }
 
   @Test
-  public void TapSingleFingerTest() {
-    driver.tap(1,100,200,1000);
+  public void TapSingleFingerTest() throws InterruptedException {
+    Thread.sleep(2500);
+    driver.tap(1,200,300,1000);
   }
 }
diff --git a/src/test/java/io/appium/java_client/MobileDriverIOSTest.java b/src/test/java/io/appium/java_client/MobileDriverIOSTest.java
@@ -23,6 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.ScreenOrientation;
+import org.openqa.selenium.html5.Location;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;
@@ -130,4 +131,10 @@ public void orientationTest() {
     assertEquals(ScreenOrientation.LANDSCAPE, driver.getOrientation());
   }
 
+  @Test
+  public void geolocationTest() {
+    Location location = new Location(45, 45, 100);
+    driver.setLocation(location);
+  }
+
 }
