Merge pull request #2 from Jonahss/uiautomation

added -ios uiautomation locator strategy

Author: Jonahss

src/io/appium/java_client/AppiumDriver.java

@@ -18,10 +18,7 @@
 
 
 import com.google.common.collect.ImmutableMap;
-import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.ContextAware;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.*;
 import org.openqa.selenium.remote.*;
 
 import java.net.URL;
@@ -30,7 +27,7 @@
 import java.util.Map;
 import java.util.Set;
 
-public class AppiumDriver extends RemoteWebDriver implements MobileDriver, ContextAware {
+public class AppiumDriver extends RemoteWebDriver implements MobileDriver, ContextAware, FindsByIosUIAutomation {
 
   private final MobileErrorHandler errorHandler = new MobileErrorHandler();
 
@@ -45,6 +42,7 @@ public AppiumDriver(URL remoteAddress, Capabilities desiredCapabilities){
 
   }
 
+  @Override
   protected Response execute(String driverCommand, Map<String, ?> parameters) {
     try {
       return super.execute(driverCommand, parameters);
@@ -56,14 +54,15 @@ protected Response execute(String driverCommand, Map<String, ?> parameters) {
             "definitely in the Appium Driver");
   }
 
+  @Override
   protected Response execute(String command) {
     return execute(command, ImmutableMap.<String, Object>of());
   }
 
 
 
 
-
+  @Override
   public WebDriver context(String name) {
     if (name == null) {
       throw new IllegalArgumentException("Must supply a context name");
@@ -74,7 +73,7 @@ public WebDriver context(String name) {
     return AppiumDriver.this;
   }
 
-
+  @Override
   public Set<String> getContextHandles() {
     Response response = execute(DriverCommand.GET_CONTEXT_HANDLES);
     Object value = response.getValue();
@@ -86,12 +85,22 @@ public Set<String> getContextHandles() {
     }
   }
 
-
+  @Override
   public String getContext() {
     String contextName = String.valueOf(execute(DriverCommand.GET_CURRENT_CONTEXT_HANDLE).getValue());
     if (contextName.equals("null")) {
       return null;
     }
     return contextName;
   }
+
+  @Override
+  public WebElement findElementByIosUIAutomation(String using) {
+    return findElement("-ios uiautomation", using);
+  }
+
+  @Override
+  public List<WebElement> findElementsByIosUIAutomation(String using) {
+    return findElements("-ios uiautomation", using);
+  }
 }

src/io/appium/java_client/FindsByIosUIAutomation.java

@@ -0,0 +1,27 @@
+/*
+Copyright 2014 Appium committers
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+
+package io.appium.java_client;
+
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public interface FindsByIosUIAutomation {
+  WebElement findElementByIosUIAutomation(String using);
+
+  List<WebElement> findElementsByIosUIAutomation(String using);
+}

src/io/appium/java_client/MobileBy.java

@@ -0,0 +1,48 @@
+package io.appium.java_client;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.SearchContext;
+import org.openqa.selenium.WebElement;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by jonahss on 4/10/14.
+ */
+public abstract class MobileBy extends By {
+
+  public static By IosUIAutomation(final String uiautomationText) {
+    if (uiautomationText == null) {
+      throw new IllegalArgumentException("Must supply a uiautomationText");
+    }
+
+    return new ByIosUIAutomation(uiautomationText);
+  }
+
+  public static class ByIosUIAutomation extends By implements Serializable {
+
+    private final String automationText;
+
+    public ByIosUIAutomation(String uiautomationText)   {
+      automationText = uiautomationText;
+    }
+
+    @Override
+    public List<WebElement> findElements(SearchContext context) {
+      return ((FindsByIosUIAutomation) context).findElementsByIosUIAutomation(automationText);
+    }
+
+    @Override
+    public WebElement findElement(SearchContext context) {
+      return ((FindsByIosUIAutomation) context).findElementByIosUIAutomation(automationText);
+    }
+
+    @Override
+    public String toString() {
+      return "By.IosUIAutomation: " + automationText;
+    }
+  }
+}
+
+

test/io/appium/java_client/ContextTest.java

@@ -21,7 +21,7 @@ public class ContextTest {
   @Before
   public void setup() throws Exception {
     File appDir = new File("test/io/appium/java_client");
-    File app = new File(appDir, "WebViewApp.app");
+    File app = new File(appDir, "WebViewApp.app.zip");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(CapabilityType.VERSION, "7.1");

test/io/appium/java_client/IosUIAutomationTest.java

@@ -0,0 +1,66 @@
+package io.appium.java_client;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.CapabilityType;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test context-related features
+ */
+public class IosUIAutomationTest {
+
+  private AppiumDriver driver;
+
+  @Before
+  public void setup() throws Exception {
+    File appDir = new File("test/io/appium/java_client");
+    File app = new File(appDir, "UICatalog.app.zip");
+    DesiredCapabilities capabilities = new DesiredCapabilities();
+    capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
+    capabilities.setCapability(CapabilityType.VERSION, "7.1");
+    capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
+    capabilities.setCapability("device", "iPhone Simulator");
+    capabilities.setCapability("app", app.getAbsolutePath());
+    driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    driver.quit();
+  }
+
+  @Test
+  public void findElementTest() {
+    WebElement element = driver.findElementByIosUIAutomation(".elements()[0]");
+    assertEquals(element.getAttribute("name"), "UICatalog");
+  }
+
+  @Test
+  public void findElementsTest() {
+    List<WebElement> elements = driver.findElementsByIosUIAutomation("elements()");
+    assertEquals(3, elements.size());
+  }
+
+  @Test
+  public void MobileElementByTest() {
+    WebElement element = driver.findElement(MobileBy.IosUIAutomation(".elements()[0]"));
+    System.out.println(element);
+    assertEquals(element.getAttribute("name"), "UICatalog");
+  }
+
+  @Test
+  public void MobileElementsByTest() {
+    List<WebElement> elements = driver.findElements(MobileBy.IosUIAutomation(".elements()"));
+    assertEquals(3, elements.size());
+  }
+
+}