From f84cded7940e6361ade3001f458a892c1808e8d7 Mon Sep 17 00:00:00 2001 From: Siarhei Valiulik Date: Mon, 18 Aug 2014 10:55:09 +0300 Subject: [PATCH] Update all tests to use constants from MobilePlatform and MobileBrowserType --- .../pagefactory/AppiumAnnotations.java | 20 ++-- .../java_client/AccessibilityIdTest.java | 3 +- .../java_client/AndroidGestureTest.java | 4 +- .../java_client/AndroidUIAutomatorTest.java | 3 +- .../io/appium/java_client/ContextTest.java | 3 +- .../java_client/IosUIAutomationTest.java | 4 +- .../java_client/MobileDriverAndroidTest.java | 4 +- .../java_client/MobileDriverIOSTest.java | 4 +- .../io/appium/java_client/iOSGestureTest.java | 3 +- .../AndroidPageObjectTest.java | 112 +++++++++--------- .../pagefactory_tests/iOSPageObjectTest.java | 89 +++++++------- 11 files changed, 131 insertions(+), 118 deletions(-) diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java b/src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java index 6c8d48b67..724435317 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java @@ -1,5 +1,6 @@ package io.appium.java_client.pagefactory; +import static io.appium.java_client.remote.MobilePlatform.*; import io.appium.java_client.MobileBy; import java.lang.annotation.Annotation; @@ -28,9 +29,6 @@ class AppiumAnnotations extends Annotations{ } }; private final static Class[] DEFAULT_ANNOTATION_METHOD_ARGUMENTS = new Class[] {}; - private final static String ANDROID_PLATFORM = "Android"; - private final static String IOS_PLATFORM = "iOS"; - private static List getMethodNames(Method[] methods) { List names = new ArrayList(); for (Method m : methods) { @@ -168,9 +166,9 @@ private void assertValidAnnotations() { } private static Method[] prepareAnnotationMethods( - Class annotation) { + Class annotation) { List targeAnnotationMethodNamesList = getMethodNames(annotation.getDeclaredMethods()); - targeAnnotationMethodNamesList.removeAll(METHODS_TO_BE_EXCLUDED_WHEN_ANNOTATION_IS_READ); + targeAnnotationMethodNamesList.removeAll(METHODS_TO_BE_EXCLUDED_WHEN_ANNOTATION_IS_READ); Method[] result = new Method[targeAnnotationMethodNamesList.size()]; for (String methodName: targeAnnotationMethodNamesList){ try { @@ -180,7 +178,7 @@ private static Method[] prepareAnnotationMethods( } catch (SecurityException e) { throw new RuntimeException(e); } - } + } return result; } @@ -235,26 +233,26 @@ public By buildBy() { AndroidFindBy androidBy = mobileField .getAnnotation(AndroidFindBy.class); - if (androidBy != null && ANDROID_PLATFORM.toUpperCase().equals(platform)) { + if (androidBy != null && ANDROID.toUpperCase().equals(platform)) { return getMobileBy(androidBy, getFilledValue(androidBy)); } AndroidFindBys androidBys = mobileField .getAnnotation(AndroidFindBys.class); - if (androidBys != null && ANDROID_PLATFORM.toUpperCase().equals(platform)) { + if (androidBys != null && ANDROID.toUpperCase().equals(platform)) { return getChainedMobileBy(androidBys.value()); } iOSFindBy iOSBy = mobileField.getAnnotation(iOSFindBy.class); - if (iOSBy != null && IOS_PLATFORM.toUpperCase().equals(platform)) { + if (iOSBy != null && IOS.toUpperCase().equals(platform)) { return getMobileBy(iOSBy, getFilledValue(iOSBy)); } iOSFindBys iOSBys = mobileField.getAnnotation(iOSFindBys.class); - if (iOSBys != null && IOS_PLATFORM.toUpperCase().equals(platform)) { + if (iOSBys != null && IOS.toUpperCase().equals(platform)) { return getChainedMobileBy(iOSBys.value()); } - + return super.buildBy(); } diff --git a/src/test/java/io/appium/java_client/AccessibilityIdTest.java b/src/test/java/io/appium/java_client/AccessibilityIdTest.java index 8340d90e8..4b404dfb7 100644 --- a/src/test/java/io/appium/java_client/AccessibilityIdTest.java +++ b/src/test/java/io/appium/java_client/AccessibilityIdTest.java @@ -3,6 +3,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; import java.io.File; import java.net.URL; @@ -28,7 +29,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); diff --git a/src/test/java/io/appium/java_client/AndroidGestureTest.java b/src/test/java/io/appium/java_client/AndroidGestureTest.java index f3f406e58..40a2b268e 100644 --- a/src/test/java/io/appium/java_client/AndroidGestureTest.java +++ b/src/test/java/io/appium/java_client/AndroidGestureTest.java @@ -18,6 +18,8 @@ package io.appium.java_client; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,7 +46,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); } diff --git a/src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java b/src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java index a3aed89b2..9c142f9a5 100644 --- a/src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java +++ b/src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java @@ -3,6 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; import java.io.File; import java.net.URL; @@ -28,7 +29,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); } diff --git a/src/test/java/io/appium/java_client/ContextTest.java b/src/test/java/io/appium/java_client/ContextTest.java index 40a0bb547..8639d3a12 100644 --- a/src/test/java/io/appium/java_client/ContextTest.java +++ b/src/test/java/io/appium/java_client/ContextTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; import java.io.File; import java.net.URL; @@ -42,7 +43,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); diff --git a/src/test/java/io/appium/java_client/IosUIAutomationTest.java b/src/test/java/io/appium/java_client/IosUIAutomationTest.java index 9c542cb75..0250259ef 100644 --- a/src/test/java/io/appium/java_client/IosUIAutomationTest.java +++ b/src/test/java/io/appium/java_client/IosUIAutomationTest.java @@ -1,6 +1,8 @@ package io.appium.java_client; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -27,7 +29,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); diff --git a/src/test/java/io/appium/java_client/MobileDriverAndroidTest.java b/src/test/java/io/appium/java_client/MobileDriverAndroidTest.java index 3ecd1c8f6..99d23885e 100644 --- a/src/test/java/io/appium/java_client/MobileDriverAndroidTest.java +++ b/src/test/java/io/appium/java_client/MobileDriverAndroidTest.java @@ -18,6 +18,8 @@ package io.appium.java_client; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; + import org.apache.commons.codec.binary.Base64; import org.junit.After; import org.junit.Before; @@ -43,7 +45,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); capabilities.setCapability(MobileCapabilityType.NEW_COMMAND_TIMEOUT, 120); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); diff --git a/src/test/java/io/appium/java_client/MobileDriverIOSTest.java b/src/test/java/io/appium/java_client/MobileDriverIOSTest.java index 75a3576e1..0256576a4 100644 --- a/src/test/java/io/appium/java_client/MobileDriverIOSTest.java +++ b/src/test/java/io/appium/java_client/MobileDriverIOSTest.java @@ -19,6 +19,8 @@ import io.appium.java_client.remote.HideKeyboardStrategy; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -45,7 +47,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); diff --git a/src/test/java/io/appium/java_client/iOSGestureTest.java b/src/test/java/io/appium/java_client/iOSGestureTest.java index 684c5f952..f3307c589 100644 --- a/src/test/java/io/appium/java_client/iOSGestureTest.java +++ b/src/test/java/io/appium/java_client/iOSGestureTest.java @@ -18,6 +18,7 @@ package io.appium.java_client; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; import java.io.File; import java.net.URL; @@ -45,7 +46,7 @@ public void setup() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java index 7ca5a57a2..0704c39f7 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java @@ -8,10 +8,12 @@ import io.appium.java_client.pagefactory.iOSFindBy; import io.appium.java_client.pagefactory.iOSFindBys; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; import java.io.File; import java.net.URL; import java.util.List; + import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -24,94 +26,94 @@ import org.openqa.selenium.support.PageFactory; public class AndroidPageObjectTest { - + private AppiumDriver driver; @FindBy(className = "android.widget.TextView") private List textVieWs; - + @AndroidFindBy(className = "android.widget.TextView") private List androidTextViews; - + @iOSFindBy(uiAutomator = ".elements()[0]") - private List iosTextViews; - + private List iosTextViews; + @iOSFindBy(uiAutomator = ".elements()[0]") @AndroidFindBy(className = "android.widget.TextView") private List androidOriOsTextViews; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") private List androidUIAutomatorViews; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") private List mobileElementViews; - + @FindBy(className = "android.widget.TextView") private List mobiletextVieWs; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") private List remoteElementViews; - + @AndroidFindBys({ @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/list\")"), @AndroidFindBy(className = "android.widget.TextView") }) private List chainElementViews; - + @iOSFindBys({@iOSFindBy(uiAutomator = ".elements()[0]"), @iOSFindBy(xpath = "//someElement")}) - private List iosChainTextViews; - + private List iosChainTextViews; + @AndroidFindBys({ @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/list\")"), @AndroidFindBy(id = "android:id/text1") }) @iOSFindBys({@iOSFindBy(uiAutomator = ".elements()[0]"), @iOSFindBy(xpath = "//someElement")}) - private List chainAndroidOrIOSUIAutomatorViews; - - + private List chainAndroidOrIOSUIAutomatorViews; + + @FindBy(id = "android:id/text1") - private WebElement textView; - + private WebElement textView; + @AndroidFindBy(className = "android.widget.TextView") private WebElement androidTextView; - + @iOSFindBy(uiAutomator = ".elements()[0]") private WebElement iosTextView; - + @AndroidFindBy(className = "android.widget.TextView") @iOSFindBy(uiAutomator = ".elements()[0]") private WebElement androidOriOsTextView; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") private WebElement androidUIAutomatorView; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") private MobileElement mobileElementView; - + @FindBy(className = "android.widget.TextView") private MobileElement mobiletextVieW; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") - private RemoteWebElement remotetextVieW; - + private RemoteWebElement remotetextVieW; + @AndroidFindBys({ @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/list\")"), @AndroidFindBy(className = "android.widget.TextView") }) private WebElement chainElementView; - + @iOSFindBys({@iOSFindBy(uiAutomator = ".elements()[0]"), @iOSFindBy(xpath = "//someElement")}) private WebElement iosChainTextView; - + @AndroidFindBys({ @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/list\")"), @AndroidFindBy(id = "android:id/text1") }) @iOSFindBys({@iOSFindBy(uiAutomator = ".elements()[0]"), @iOSFindBy(xpath = "//someElement")}) - private WebElement chainAndroidOrIOSUIAutomatorView; + private WebElement chainAndroidOrIOSUIAutomatorView; @Before public void setUp() throws Exception { @@ -120,7 +122,7 @@ public void setUp() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); @@ -136,28 +138,28 @@ public void tearDown() throws Exception { public void findByElementsTest() { Assert.assertNotEquals(0, textVieWs.size()); } - + @Test public void findByElementTest() { Assert.assertNotEquals(null, textView.getAttribute("text")); } - - + + @Test public void androidFindByElementsTest(){ Assert.assertNotEquals(0, androidTextViews.size()); } - + @Test public void androidFindByElementTest(){ Assert.assertNotEquals(null, androidTextView.getAttribute("text")); } - + @Test public void checkThatElementsWereNotFoundByIOSUIAutomator(){ Assert.assertEquals(0, iosTextViews.size()); } - + @Test public void checkThatElementWasNotFoundByIOSUIAutomator(){ NoSuchElementException nsee = null; @@ -169,72 +171,72 @@ public void checkThatElementWasNotFoundByIOSUIAutomator(){ } Assert.assertNotNull(nsee); } - + @Test public void androidOrIOSFindByElementsTest(){ Assert.assertNotEquals(0, androidOriOsTextViews.size()); } - + @Test public void androidOrIOSFindByElementTest(){ Assert.assertNotEquals(null, androidOriOsTextView.getAttribute("text")); } - + @Test public void androidFindByUIAutomatorElementsTest(){ Assert.assertNotEquals(0, androidUIAutomatorViews.size()); } - + @Test public void androidFindByUIAutomatorElementTest(){ Assert.assertNotEquals(null, androidUIAutomatorView.getAttribute("text")); } - + @Test public void areMobileElementsTest(){ Assert.assertNotEquals(0, mobileElementViews.size()); } - + @Test public void isMobileElementTest(){ Assert.assertNotEquals(null, mobileElementView.getAttribute("text")); } - + @Test public void areMobileElements_FindByTest(){ Assert.assertNotEquals(0, mobiletextVieWs.size()); } - + @Test public void isMobileElement_FindByTest(){ Assert.assertNotEquals(null, mobiletextVieW.getAttribute("text")); - } - + } + @Test public void areRemoteElementsTest(){ Assert.assertNotEquals(0, remoteElementViews.size()); } - + @Test public void isRemoteElementTest(){ Assert.assertNotEquals(null, remotetextVieW.getAttribute("text")); - } - + } + @Test public void androidChainSearchElementsTest(){ Assert.assertNotEquals(0, chainElementViews.size()); } - + @Test public void androidChainSearchElementTest(){ Assert.assertNotEquals(null, chainElementView.getAttribute("text")); - } - + } + @Test public void checkThatElementsWereNotFoundByIOSUIAutomator_Chain(){ Assert.assertEquals(0, iosChainTextViews.size()); - } - + } + @Test public void checkThatElementWasNotFoundByIOSUIAutomator_Chain(){ NoSuchElementException nsee = null; @@ -255,5 +257,5 @@ public void androidOrIOSFindByElementsTest_ChainSearches(){ @Test public void androidOrIOSFindByElementTest_ChainSearches(){ Assert.assertNotEquals(null, chainAndroidOrIOSUIAutomatorView.getAttribute("text")); - } + } } diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java index e9d228f2c..8d8975163 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/iOSPageObjectTest.java @@ -7,6 +7,7 @@ import io.appium.java_client.pagefactory.AppiumFieldDecorator; import io.appium.java_client.pagefactory.iOSFindBy; import io.appium.java_client.remote.MobileCapabilityType; +import io.appium.java_client.remote.MobilePlatform; import java.io.File; import java.net.URL; @@ -24,65 +25,65 @@ import org.openqa.selenium.support.PageFactory; public class iOSPageObjectTest { - + private AppiumDriver driver; @FindBy(className = "UIAButton") private List uiButtons; - + @FindBy(className = "UIAButton") private List iosUIButtons; - + @iOSFindBy(uiAutomator = ".elements()[0]") - private List iosUIAutomatorButtons; - + private List iosUIAutomatorButtons; + @iOSFindBy(uiAutomator = ".elements()[0]") @AndroidFindBy(className = "android.widget.TextView") private List androidOriOsTextViews; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") private List androidUIAutomatorViews; - + @iOSFindBy(uiAutomator = ".elements()[0]") private List mobileButtons; - + @FindBy(className = "UIAButton") private List mobiletFindBy_Buttons; - + @iOSFindBy(uiAutomator = ".elements()[0]") private List remoteElementViews; - + @AndroidFindBys({ @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/list\")"), @AndroidFindBy(className = "android.widget.TextView") }) private List chainElementViews; - - + + @FindBy(className = "UIAButton") - private WebElement uiButton; - + private WebElement uiButton; + @FindBy(className = "UIAButton") private WebElement iosUIButton; - + @iOSFindBy(uiAutomator = ".elements()[0]") private WebElement iosUIAutomatorButton; - + @AndroidFindBy(className = "android.widget.TextView") @iOSFindBy(uiAutomator = ".elements()[0]") private WebElement androidOriOsTextView; - + @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/text1\")") private WebElement androidUIAutomatorView; - + @iOSFindBy(uiAutomator = ".elements()[0]") private MobileElement mobileButton; - + @FindBy(className = "UIAButton") private MobileElement mobiletFindBy_Button; - + @iOSFindBy(uiAutomator = ".elements()[0]") - private RemoteWebElement remotetextVieW; - + private RemoteWebElement remotetextVieW; + @AndroidFindBys({ @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"android:id/list\")"), @AndroidFindBy(className = "android.widget.TextView") @@ -96,7 +97,7 @@ public void setUp() throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, ""); capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1"); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator"); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); @@ -113,28 +114,28 @@ public void tearDown() throws Exception { public void findByElementsTest() { Assert.assertNotEquals(0, uiButtons.size()); } - + @Test public void findByElementTest() { Assert.assertNotEquals(null, uiButton.getText()); } - - + + @Test public void iOSFindByElementsTest(){ Assert.assertNotEquals(0, iosUIButtons.size()); } - + @Test public void iosFindByElementTest(){ Assert.assertNotEquals(null, iosUIButton.getText()); } - + @Test public void checkThatElementsWereNotFoundByAndroidUIAutomator(){ Assert.assertEquals(0, androidUIAutomatorViews.size()); } - + @Test public void checkThatElementWasNotFoundByAndroidUIAutomator(){ NoSuchElementException nsee = null; @@ -146,62 +147,62 @@ public void checkThatElementWasNotFoundByAndroidUIAutomator(){ } Assert.assertNotNull(nsee); } - + @Test public void androidOrIOSFindByElementsTest(){ Assert.assertNotEquals(0, androidOriOsTextViews.size()); } - + @Test public void androidOrIOSFindByElementTest(){ Assert.assertNotEquals(null, androidOriOsTextView.getText()); } - + @Test public void iOSFindByUIAutomatorElementsTest(){ Assert.assertNotEquals(0, iosUIAutomatorButtons.size()); } - + @Test public void iOSFindByUIAutomatorElementTest(){ Assert.assertNotEquals(null, iosUIAutomatorButton.getText()); } - + @Test public void areMobileElementsTest(){ Assert.assertNotEquals(0, mobileButtons.size()); } - + @Test public void isMobileElementTest(){ Assert.assertNotEquals(null, mobileButton.getText()); } - + @Test public void areMobileElements_FindByTest(){ Assert.assertNotEquals(0, mobiletFindBy_Buttons.size()); } - + @Test public void isMobileElement_FindByTest(){ Assert.assertNotEquals(null, mobiletFindBy_Button.getText()); - } - + } + @Test public void areRemoteElementsTest(){ Assert.assertNotEquals(0, remoteElementViews.size()); } - + @Test public void isRemoteElementTest(){ Assert.assertNotEquals(null, remotetextVieW.getText()); - } - + } + @Test public void checkThatElementsWereNotFoundByAndroidUIAutomator_Chain(){ Assert.assertEquals(0, chainElementViews.size()); - } - + } + @Test public void checkThatElementWasNotFoundByAndroidUIAutomator_Chain(){ NoSuchElementException nsee = null;