The refactoring of widget tests: All simple cases were implemented

TikhomirovSergey · TikhomirovSergey · commit a079f48514dd · 2017-07-02T00:20:54.000+03:00
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java
@@ -1,19 +1,25 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.android;
 
 import io.appium.java_client.pagefactory.AndroidFindBy;
+import io.appium.java_client.pagefactory.SelendroidFindBy;
 import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
 
 import java.util.List;
 
 public class AndroidApp extends AbstractApp{
 
     public static String ANDROID_DEFAULT_WIDGET_LOCATOR = "SOME_ANDROID_DEFAULT_LOCATOR";
+    public static String ANDROID_SELENDROID_WIDGET_LOCATOR = "SOME_SELENDROID_DEFAULT_LOCATOR";
+
     public static String ANDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "SOME_ANDROID_EXTERNALLY_DEFINED_LOCATOR";
+    public static String SELENDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "SOME_SELENDROID_EXTERNALLY_DEFINED_LOCATOR";
 
     @AndroidFindBy(uiAutomator = "SOME_ANDROID_DEFAULT_LOCATOR")
+    @SelendroidFindBy(linkText = "SOME_SELENDROID_DEFAULT_LOCATOR")
     private DefaultAndroidWidget singleAndroidWidget;
 
     @AndroidFindBy(uiAutomator = "SOME_ANDROID_DEFAULT_LOCATOR")
+    @SelendroidFindBy(linkText = "SOME_SELENDROID_DEFAULT_LOCATOR")
     private List<DefaultAndroidWidget> multipleAndroidWidgets;
 
     private AnnotatedAndroidWidget singleAnnotatedAndroidWidget;
@@ -25,9 +31,11 @@ public class AndroidApp extends AbstractApp{
     private List<ExtendedAndroidWidget> multipleExtendedAndroidWidgets;
 
     @AndroidFindBy(uiAutomator = "SOME_ANDROID_EXTERNALLY_DEFINED_LOCATOR")
+    @SelendroidFindBy(linkText = "SOME_SELENDROID_EXTERNALLY_DEFINED_LOCATOR")
     private ExtendedAndroidWidget singleOverriddenAndroidWidget;
 
     @AndroidFindBy(uiAutomator = "SOME_ANDROID_EXTERNALLY_DEFINED_LOCATOR")
+    @SelendroidFindBy(linkText = "SOME_SELENDROID_EXTERNALLY_DEFINED_LOCATOR")
     private List<ExtendedAndroidWidget> multipleOverriddenAndroidWidgets;
 
     @Override
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AnnotatedAndroidWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AnnotatedAndroidWidget.java
@@ -1,11 +1,14 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.android;
 
 import io.appium.java_client.pagefactory.AndroidFindBy;
+import io.appium.java_client.pagefactory.SelendroidFindBy;
 import org.openqa.selenium.WebElement;
 
 @AndroidFindBy(uiAutomator = "SOME_ROOT_LOCATOR")
+@SelendroidFindBy(linkText = "SELENDROID_SOME_ROOT_LOCATOR")
 public class AnnotatedAndroidWidget extends DefaultAndroidWidget {
     public static String ANDROID_ROOT_WIDGET_LOCATOR = "SOME_ROOT_LOCATOR";
+    public static String SELENDROID_ROOT_WIDGET_LOCATOR = "SELENDROID_SOME_ROOT_LOCATOR";
 
     protected AnnotatedAndroidWidget(WebElement element) {
         super(element);
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/DefaultAndroidWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/DefaultAndroidWidget.java
@@ -1,6 +1,7 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.android;
 
 import io.appium.java_client.pagefactory.AndroidFindBy;
+import io.appium.java_client.pagefactory.SelendroidFindBy;
 import io.appium.java_client.pagefactory_tests.widget.tests.AbstractWidget;
 import org.openqa.selenium.WebElement;
 
@@ -9,11 +10,14 @@
 public class DefaultAndroidWidget extends AbstractWidget {
 
     public static String ANDROID_SUB_WIDGET_LOCATOR = "SOME_SUB_LOCATOR";
+    public static String SELENDROID_SUB_WIDGET_LOCATOR = "SELENDROID_SOME_SUB_LOCATOR";
 
     @AndroidFindBy(uiAutomator = "SOME_SUB_LOCATOR")
+    @SelendroidFindBy(linkText = "SELENDROID_SOME_SUB_LOCATOR")
     private DefaultAndroidWidget singleWidget;
 
     @AndroidFindBy(uiAutomator = "SOME_SUB_LOCATOR")
+    @SelendroidFindBy(linkText = "SELENDROID_SOME_SUB_LOCATOR")
     private List<DefaultAndroidWidget> multipleWidgets;
 
     protected DefaultAndroidWidget(WebElement element) {
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/SelendroidWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/SelendroidWidgetTest.java
@@ -0,0 +1,40 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.android;
+
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+
+import static io.appium.java_client.pagefactory_tests.widget.tests.android.AndroidApp.ANDROID_SELENDROID_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.android.AndroidApp.SELENDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.android.AnnotatedAndroidWidget.SELENDROID_ROOT_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.android.DefaultAndroidWidget.SELENDROID_SUB_WIDGET_LOCATOR;
+import static org.openqa.selenium.By.linkText;
+
+public class SelendroidWidgetTest extends WidgetTest {
+    public SelendroidWidgetTest() {
+        super(new AndroidApp(), new AbstractStubWebDriver.StubSelendroidDriver());
+    }
+
+    @Override
+    public void checkACommonWidget() {
+        defaultTest(app.getWidget(), app.getWidgets(),
+                linkText(ANDROID_SELENDROID_WIDGET_LOCATOR), linkText(SELENDROID_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkAnAnnotatedWidget() {
+        defaultTest(app.getAnnotatedWidget(), app.getAnnotatedWidgets(),
+                linkText(SELENDROID_ROOT_WIDGET_LOCATOR), linkText(SELENDROID_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkAnExtendedWidget() {
+        defaultTest(app.getExtendedWidget(), app.getExtendedWidgets(),
+                linkText(SELENDROID_ROOT_WIDGET_LOCATOR), linkText(SELENDROID_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkTheLocatorOverridingOnAWidget() {
+        defaultTest(app.getExtendedWidgetWithOverriddenLocators(), app.getExtendedWidgetsWithOverriddenLocators(),
+                linkText(SELENDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR), linkText(SELENDROID_SUB_WIDGET_LOCATOR));
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/AnnotatedIosWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/AnnotatedIosWidget.java
@@ -0,0 +1,16 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.ios;
+
+import io.appium.java_client.pagefactory.iOSFindBy;
+import io.appium.java_client.pagefactory.iOSXCUITFindBy;
+import org.openqa.selenium.WebElement;
+
+@iOSFindBy(uiAutomator = "SOME_ROOT_LOCATOR")
+@iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_ROOT_LOCATOR")
+public class AnnotatedIosWidget extends DefaultIosWidget {
+    public static String IOS_ROOT_WIDGET_LOCATOR = "SOME_ROOT_LOCATOR";
+    public static String XCUIT_ROOT_WIDGET_LOCATOR = "XCUIT_SOME_ROOT_LOCATOR";
+
+    protected AnnotatedIosWidget(WebElement element) {
+        super(element);
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/DefaultIosWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/DefaultIosWidget.java
@@ -0,0 +1,36 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.ios;
+
+import io.appium.java_client.pagefactory.iOSFindBy;
+import io.appium.java_client.pagefactory.iOSXCUITFindBy;
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractWidget;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class DefaultIosWidget extends AbstractWidget {
+
+    public static String IOS_SUB_WIDGET_LOCATOR = "SOME_SUB_LOCATOR";
+    public static String XCUIT_SUB_WIDGET_LOCATOR = "XCUIT_SOME_SUB_LOCATOR";
+
+    @iOSFindBy(uiAutomator = "SOME_SUB_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_SUB_LOCATOR")
+    private DefaultIosWidget singleWidget;
+
+    @iOSFindBy(uiAutomator = "SOME_SUB_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_SUB_LOCATOR")
+    private List<DefaultIosWidget> multipleWidgets;
+
+    protected DefaultIosWidget(WebElement element) {
+        super(element);
+    }
+
+    @Override
+    public DefaultIosWidget getSubWidget() {
+        return singleWidget;
+    }
+
+    @Override
+    public List<DefaultIosWidget> getSubWidgets() {
+        return multipleWidgets;
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/ExtendedIosWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/ExtendedIosWidget.java
@@ -0,0 +1,9 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.ios;
+
+import org.openqa.selenium.WebElement;
+
+public class ExtendedIosWidget extends AnnotatedIosWidget {
+    protected ExtendedIosWidget(WebElement element) {
+        super(element);
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/IosApp.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/IosApp.java
@@ -0,0 +1,82 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.ios;
+
+import io.appium.java_client.pagefactory.AndroidFindBy;
+import io.appium.java_client.pagefactory.SelendroidFindBy;
+import io.appium.java_client.pagefactory.iOSFindBy;
+import io.appium.java_client.pagefactory.iOSXCUITFindBy;
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
+
+import java.util.List;
+
+public class IosApp extends AbstractApp{
+
+    public static String IOS_DEFAULT_WIDGET_LOCATOR = "SOME_IOS_DEFAULT_LOCATOR";
+    public static String IOS_XCUIT_WIDGET_LOCATOR = "SOME_XCUIT_DEFAULT_LOCATOR";
+
+    public static String IOS_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "IOS_EXTERNALLY_DEFINED_WIDGET_LOCATOR";
+    public static String XCUIT_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "SOME_XCUIT_EXTERNALLY_DEFINED_LOCATOR";
+
+    @iOSFindBy(uiAutomator = "SOME_IOS_DEFAULT_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "SOME_XCUIT_DEFAULT_LOCATOR")
+    private DefaultIosWidget singleIosWidget;
+
+    @iOSFindBy(uiAutomator = "SOME_IOS_DEFAULT_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "SOME_XCUIT_DEFAULT_LOCATOR")
+    private List<DefaultIosWidget> multipleIosWidgets;
+
+    private AnnotatedIosWidget singleAnnotatedIosWidget;
+
+    private List<AnnotatedIosWidget> multipleIosIosWidgets;
+
+    private ExtendedIosWidget singleExtendedIosWidget;
+
+    private List<ExtendedIosWidget> multipleExtendedIosWidgets;
+
+    @iOSFindBy(uiAutomator = "IOS_EXTERNALLY_DEFINED_WIDGET_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "SOME_XCUIT_EXTERNALLY_DEFINED_LOCATOR")
+    private ExtendedIosWidget singleOverriddenIosWidget;
+
+    @iOSFindBy(uiAutomator = "IOS_EXTERNALLY_DEFINED_WIDGET_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "SOME_XCUIT_EXTERNALLY_DEFINED_LOCATOR")
+    private List<ExtendedIosWidget> multipleOverriddenIosWidgets;
+
+    @Override
+    public DefaultIosWidget getWidget() {
+        return singleIosWidget;
+    }
+
+    @Override
+    public List<DefaultIosWidget> getWidgets() {
+        return multipleIosWidgets;
+    }
+
+    @Override
+    public DefaultIosWidget getAnnotatedWidget() {
+        return singleAnnotatedIosWidget;
+    }
+
+    @Override
+    public List<AnnotatedIosWidget> getAnnotatedWidgets() {
+        return multipleIosIosWidgets;
+    }
+
+    @Override
+    public DefaultIosWidget getExtendedWidget() {
+        return singleExtendedIosWidget;
+    }
+
+    @Override
+    public List<ExtendedIosWidget> getExtendedWidgets() {
+        return multipleExtendedIosWidgets;
+    }
+
+    @Override
+    public DefaultIosWidget getExtendedWidgetWithOverriddenLocators() {
+        return singleOverriddenIosWidget;
+    }
+
+    @Override
+    public List<ExtendedIosWidget> getExtendedWidgetsWithOverriddenLocators() {
+        return multipleOverriddenIosWidgets;
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/IosWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/IosWidgetTest.java
@@ -0,0 +1,41 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.ios;
+
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+
+import static io.appium.java_client.MobileBy.IosUIAutomation;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.AnnotatedIosWidget.IOS_ROOT_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.DefaultIosWidget.IOS_SUB_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.IosApp.IOS_DEFAULT_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.IosApp.IOS_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
+
+public class IosWidgetTest extends WidgetTest {
+
+    public IosWidgetTest() {
+        super(new IosApp(), new AbstractStubWebDriver.StubIOSDriver());
+    }
+
+    @Override
+    public void checkACommonWidget() {
+        defaultTest(app.getWidget(), app.getWidgets(),
+                IosUIAutomation(IOS_DEFAULT_WIDGET_LOCATOR), IosUIAutomation(IOS_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkAnAnnotatedWidget() {
+        defaultTest(app.getAnnotatedWidget(), app.getAnnotatedWidgets(),
+                IosUIAutomation(IOS_ROOT_WIDGET_LOCATOR), IosUIAutomation(IOS_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkAnExtendedWidget() {
+        defaultTest(app.getExtendedWidget(), app.getExtendedWidgets(),
+                IosUIAutomation(IOS_ROOT_WIDGET_LOCATOR), IosUIAutomation(IOS_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkTheLocatorOverridingOnAWidget() {
+        defaultTest(app.getExtendedWidgetWithOverriddenLocators(), app.getExtendedWidgetsWithOverriddenLocators(),
+                IosUIAutomation(IOS_EXTERNALLY_DEFINED_WIDGET_LOCATOR), IosUIAutomation(IOS_SUB_WIDGET_LOCATOR));
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/XCUITWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/XCUITWidgetTest.java
@@ -0,0 +1,40 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.ios;
+
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+
+import static io.appium.java_client.MobileBy.iOSNsPredicateString;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.AnnotatedIosWidget.XCUIT_ROOT_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.DefaultIosWidget.XCUIT_SUB_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.IosApp.*;
+
+public class XCUITWidgetTest extends WidgetTest {
+
+    public XCUITWidgetTest() {
+        super(new IosApp(), new AbstractStubWebDriver.StubIOSXCUITDriver());
+    }
+
+    @Override
+    public void checkACommonWidget() {
+        defaultTest(app.getWidget(), app.getWidgets(),
+                iOSNsPredicateString(IOS_XCUIT_WIDGET_LOCATOR), iOSNsPredicateString(XCUIT_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkAnAnnotatedWidget() {
+        defaultTest(app.getAnnotatedWidget(), app.getAnnotatedWidgets(),
+                iOSNsPredicateString(XCUIT_ROOT_WIDGET_LOCATOR), iOSNsPredicateString(XCUIT_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkAnExtendedWidget() {
+        defaultTest(app.getExtendedWidget(), app.getExtendedWidgets(),
+                iOSNsPredicateString(XCUIT_ROOT_WIDGET_LOCATOR), iOSNsPredicateString(XCUIT_SUB_WIDGET_LOCATOR));
+    }
+
+    @Override
+    public void checkTheLocatorOverridingOnAWidget() {
+        defaultTest(app.getExtendedWidgetWithOverriddenLocators(), app.getExtendedWidgetsWithOverriddenLocators(),
+                iOSNsPredicateString(XCUIT_EXTERNALLY_DEFINED_WIDGET_LOCATOR), iOSNsPredicateString(XCUIT_SUB_WIDGET_LOCATOR));
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/AnnotatedWindowsWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/AnnotatedWindowsWidget.java
@@ -0,0 +1,15 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.windows;
+
+import io.appium.java_client.pagefactory.WindowsFindBy;
+import io.appium.java_client.pagefactory.iOSXCUITFindBy;
+import org.openqa.selenium.WebElement;
+
+@WindowsFindBy(windowsAutomation = "SOME_ROOT_LOCATOR")
+@iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_ROOT_LOCATOR")
+public class AnnotatedWindowsWidget extends DefaultWindowsWidget {
+    public static String WINDOWS_ROOT_WIDGET_LOCATOR = "SOME_ROOT_LOCATOR";
+
+    protected AnnotatedWindowsWidget(WebElement element) {
+        super(element);
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/DefaultWindowsWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/DefaultWindowsWidget.java
@@ -0,0 +1,35 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.windows;
+
+import io.appium.java_client.pagefactory.WindowsFindBy;
+import io.appium.java_client.pagefactory.iOSXCUITFindBy;
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractWidget;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class DefaultWindowsWidget extends AbstractWidget {
+
+    public static String WINDOWS_SUB_WIDGET_LOCATOR = "SOME_SUB_LOCATOR";
+
+    @WindowsFindBy(windowsAutomation =  "SOME_SUB_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_SUB_LOCATOR")
+    private DefaultWindowsWidget singleWidget;
+
+    @WindowsFindBy(windowsAutomation =  "SOME_SUB_LOCATOR")
+    @iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_SUB_LOCATOR")
+    private List<DefaultWindowsWidget> multipleWidgets;
+
+    protected DefaultWindowsWidget(WebElement element) {
+        super(element);
+    }
+
+    @Override
+    public DefaultWindowsWidget getSubWidget() {
+        return singleWidget;
+    }
+
+    @Override
+    public List<DefaultWindowsWidget> getSubWidgets() {
+        return multipleWidgets;
+    }
+}
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/ExtendedWindowsWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/ExtendedWindowsWidget.java
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsApp.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsApp.java
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsWidgetTest.java
