Merge pull request appium#142 from TikhomirovSergey/master

[*] appium#141 fix

Author: Jonahss

src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java

@@ -138,14 +138,16 @@ By getBy(Annotation annotation) {
 private final Field mobileField;
 private final String platform;
 private final String automation;
+private final boolean isBrowser;
 
-AppiumAnnotations(Field field, String platform, String automation) {
+AppiumAnnotations(Field field, String platform, String automation, boolean isBrowser) {
 super(field);
 mobileField = field;
 this.platform = String.valueOf(platform).
 toUpperCase().trim();
 this.automation = String.valueOf(automation).
  toUpperCase().trim();
+this.isBrowser = isBrowser;
 }
 
 private static void checkDisallowedAnnotationPairs(Annotation a1,
@@ -260,6 +262,11 @@ private <T extends By> T getComplexMobileBy(Annotation[] annotations, Class<T> r
 
 @Override
 public By buildBy() {
+
+if (isBrowser){
+return super.buildBy();
+}
+
 assertValidAnnotations();
 
  SelendroidFindBy selendroidBy = mobileField

src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java

@@ -8,6 +8,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openqa.selenium.By;
+import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
@@ -17,6 +18,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.internal.WrapsDriver;
 import org.openqa.selenium.internal.WrapsElement;
+import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.support.pagefactory.ElementLocator;
 import org.openqa.selenium.support.ui.FluentWait;
 
@@ -67,16 +69,24 @@ public List<WebElement> apply(By by) {
 TimeOutContainer timeOutContainer) {
 this.searchContext = searchContext;
 // All known webdrivers implement HasCapabilities
+Capabilities capabilities = ((HasCapabilities) unpackWebDriverFromSearchContext()).
+getCapabilities();
+
 String platform = String
-.valueOf(((HasCapabilities) unpackWebDriverFromSearchContext())
-.getCapabilities().getCapability(
+.valueOf(capabilities.getCapability(
 MobileCapabilityType.PLATFORM_NAME));
 String automation = String
-.valueOf(((HasCapabilities) unpackWebDriverFromSearchContext())
-.getCapabilities().getCapability(
+.valueOf(capabilities.getCapability(
 MobileCapabilityType.AUTOMATION_NAME));
+
+String browser = (String) capabilities.getCapability(CapabilityType.BROWSER_NAME);
+String app = (String) capabilities.getCapability(MobileCapabilityType.APP);
+
+boolean isBrowser = ((app == null || "".equals(app.trim())) && 
+(browser != null && !"".equals(browser.trim())));
 
-AppiumAnnotations annotations = new AppiumAnnotations(field, platform, automation);
+AppiumAnnotations annotations = new AppiumAnnotations(field, 
+platform, automation, isBrowser);
 this.timeOutContainer = timeOutContainer;
 shouldCache = annotations.isLookupCached();
 by = annotations.buildBy();

src/main/java/io/appium/java_client/pagefactory/SelendroidFindBy.java

@@ -11,7 +11,7 @@
  * element or a list of elements. Used in conjunction with
  * {@link org.openqa.selenium.support.PageFactory}
  * this allows users to quickly and easily create PageObjects.
- * using Android UI selectors, accessibility, id, name, class name, tag and xpath
+ * using Selendroid UI selectors like, id, name, class name, tag and xpath
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.TYPE})

src/test/java/io/appium/java_client/pagefactory_tests/BrowserCompatibilityTest.java renamed to src/test/java/io/appium/java_client/pagefactory_tests/DesctopBrowserCompatibilityTest.java

@@ -30,7 +30,7 @@
 import org.openqa.selenium.support.PageFactory;
 import org.openqa.selenium.remote.RemoteWebElement;
 
-public class BrowserCompatibilityTest {
+public class DesctopBrowserCompatibilityTest {
 
 private static enum AvailableDrivers {
 FIREFOX(FirefoxDriver.class, new ArrayList<Platform>() {

src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java

@@ -0,0 +1,71 @@
+package io.appium.java_client.pagefactory_tests;
+
+import io.appium.java_client.android.AndroidDriver;
+import io.appium.java_client.pagefactory.AndroidFindBy;
+import io.appium.java_client.pagefactory.AndroidFindBys;
+import io.appium.java_client.pagefactory.AppiumFieldDecorator;
+import io.appium.java_client.remote.MobileBrowserType;
+import io.appium.java_client.remote.MobileCapabilityType;
+
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.remote.RemoteWebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.FindBys;
+import org.openqa.selenium.support.PageFactory;
+
+public class MobileBrowserCompatibilityTest {
+
+private WebDriver driver;
+
+@FindBy(name = "q")
+@AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/someId\")")
+private WebElement searchTextField;
+
+@AndroidFindBys({
+@AndroidFindBy(className = "someClass"),
+@AndroidFindBy(xpath = "//someTag")})
+@FindBy(name="btnG")
+private RemoteWebElement searchButton;
+
+@AndroidFindBy(className = "someClass")
+@FindBys({@FindBy(className = "r"), @FindBy(tagName = "a")})
+private List<WebElement> foundLinks;
+
+@Before
+public void setUp() throws Exception {
+ DesiredCapabilities capabilities = new DesiredCapabilities();
+ capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
+ capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, MobileBrowserType.BROWSER);
+ driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+ //This time out is set because test can be run on slow Android SDK emulator
+ PageFactory.initElements(new AppiumFieldDecorator(driver, 5, TimeUnit.SECONDS), this);
+}
+
+@After
+public void tearDown() throws Exception {
+driver.quit();
+}
+
+@Test
+public void test() {
+driver.get("https://www.google.com");
+
+searchTextField.sendKeys("Hello");
+searchButton.click();
+Assert.assertNotEquals(0, foundLinks.size());
+searchTextField.clear();
+searchTextField.sendKeys("Hello, Appium!");
+searchButton.click();
+}
+
+}

src/test/java/io/appium/java_client/pagefactory_tests/SelendroidModeTest.java

@@ -7,11 +7,14 @@
 import io.appium.java_client.pagefactory.SelendroidFindBy;
 import io.appium.java_client.pagefactory.SelendroidFindBys;
 import io.appium.java_client.remote.MobileCapabilityType;
+
 import org.openqa.selenium.WebElement;
+
 import java.io.File;
 import java.net.URL;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -22,6 +25,7 @@
 import org.openqa.selenium.support.PageFactory;
 
 public class SelendroidModeTest {
+private static int SELENDROID_PORT = 9999;
 
  private WebDriver driver;
 
@@ -62,14 +66,15 @@ public class SelendroidModeTest {
  @SelendroidFindBy(tagName = "TextView")
  private WebElement textTag;
 
- @Before
+@Before
  public void setUp() throws Exception {
  File appDir = new File("src/test/java/io/appium/java_client");
  File app = new File(appDir, "ApiDemos-debug.apk");
  DesiredCapabilities capabilities = new DesiredCapabilities();
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
  capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
  capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, "Selendroid");
+ capabilities.setCapability(MobileCapabilityType.SELENDROID_PORT, SELENDROID_PORT);
  driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
 
  //This time out is set because test can be run on slow Android SDK emulator