The refactoring of widget tests: Test API was re-designed

Author: TikhomirovSergey

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractApp.java

@@ -2,21 +2,10 @@
 
 import java.util.List;
 
-public abstract class AbstractApp {
+public interface AbstractApp {
 
-    public abstract <T extends AbstractWidget> T getWidget();
+    <T extends AbstractWidget> T getWidget();
 
-    public abstract <T extends AbstractWidget> List<T> getWidgets();
+    <T extends AbstractWidget> List<T> getWidgets();
 
-    public abstract <T extends AbstractWidget> T getAnnotatedWidget();
-
-    public abstract <T extends AbstractWidget> List<T> getAnnotatedWidgets();
-
-    public abstract <T extends AbstractWidget> T getExtendedWidget();
-
-    public abstract <T extends AbstractWidget> List<T> getExtendedWidgets();
-
-    public abstract <T extends AbstractWidget> T getExtendedWidgetWithOverriddenLocators();
-
-    public abstract <T extends AbstractWidget> List<T> getExtendedWidgetsWithOverriddenLocators();
 }

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ExtendedApp.java

@@ -0,0 +1,18 @@
+package io.appium.java_client.pagefactory_tests.widget.tests;
+
+import java.util.List;
+
+public interface ExtendedApp extends AbstractApp {
+
+    public abstract <T extends AbstractWidget> T getAnnotatedWidget();
+
+    public abstract <T extends AbstractWidget> List<T> getAnnotatedWidgets();
+
+    public abstract <T extends AbstractWidget> T getExtendedWidget();
+
+    public abstract <T extends AbstractWidget> List<T> getExtendedWidgets();
+
+    public abstract <T extends AbstractWidget> T getExtendedWidgetWithOverriddenLocators();
+
+    public abstract <T extends AbstractWidget> List<T> getExtendedWidgetsWithOverriddenLocators();
+}

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java

@@ -2,11 +2,11 @@
 
 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 io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
 
 import java.util.List;
 
-public class AndroidApp extends AbstractApp{
+public class AndroidApp implements ExtendedApp {
 
     public static String ANDROID_DEFAULT_WIDGET_LOCATOR = "SOME_ANDROID_DEFAULT_LOCATOR";
     public static String ANDROID_SELENDROID_WIDGET_LOCATOR = "SOME_SELENDROID_DEFAULT_LOCATOR";

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedApp.java

@@ -0,0 +1,39 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.combined;
+
+import io.appium.java_client.pagefactory.OverrideWidget;
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractWidget;
+import io.appium.java_client.pagefactory_tests.widget.tests.android.DefaultAndroidWidget;
+import io.appium.java_client.pagefactory_tests.widget.tests.ios.DefaultIosWidget;
+import io.appium.java_client.pagefactory_tests.widget.tests.windows.DefaultWindowsWidget;
+
+import java.util.List;
+
+public class CombinedApp implements AbstractApp {
+
+    @OverrideWidget(html = DefaultFindByWidget.class,
+            androidUIAutomator = DefaultAndroidWidget.class,
+            iOSUIAutomation = DefaultIosWidget.class,
+            iOSXCUITAutomation = DefaultIosXCUITWidget.class,
+            windowsAutomation = DefaultWindowsWidget.class
+    )
+    private AbstractWidget singleWidget;
+
+    @OverrideWidget(html = DefaultFindByWidget.class,
+            androidUIAutomator = DefaultAndroidWidget.class,
+            iOSUIAutomation = DefaultIosWidget.class,
+            iOSXCUITAutomation = DefaultIosXCUITWidget.class,
+            windowsAutomation = DefaultWindowsWidget.class
+    )
+    private List<AbstractWidget> multipleWidget;
+
+    @Override
+    public <T extends AbstractWidget> T getWidget() {
+        return null;
+    }
+
+    @Override
+    public <T extends AbstractWidget> List<T> getWidgets() {
+        return null;
+    }
+}

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/DefaultFindByWidget.java

@@ -0,0 +1,31 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.combined;
+
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractWidget;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+import java.util.List;
+
+public class DefaultFindByWidget extends AbstractWidget {
+
+    @FindBy(id = "SOME_SUB_LOCATOR")
+    private DefaultFindByWidget singleWidget;
+
+    @FindBy(id = "SOME_SUB_LOCATOR")
+    private List<DefaultFindByWidget> multipleWidgets;
+
+
+    protected DefaultFindByWidget(WebElement element) {
+        super(element);
+    }
+
+    @Override
+    public DefaultFindByWidget getSubWidget() {
+        return singleWidget;
+    }
+
+    @Override
+    public List<DefaultFindByWidget> getSubWidgets() {
+        return multipleWidgets;
+    }
+}

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/DefaultIosXCUITWidget.java

@@ -0,0 +1,30 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.combined;
+
+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 DefaultIosXCUITWidget extends AbstractWidget {
+
+    @iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_SUB_LOCATOR")
+    private DefaultIosXCUITWidget singleWidget;
+
+    @iOSXCUITFindBy(iOSNsPredicate = "XCUIT_SOME_SUB_LOCATOR")
+    private List<DefaultIosXCUITWidget> multipleWidgets;
+
+    protected DefaultIosXCUITWidget(WebElement element) {
+        super(element);
+    }
+
+    @Override
+    public DefaultIosXCUITWidget getSubWidget() {
+        return singleWidget;
+    }
+
+    @Override
+    public List<DefaultIosXCUITWidget> getSubWidgets() {
+        return multipleWidgets;
+    }
+}

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/DefaultSelendroidWidget.java

@@ -0,0 +1,30 @@
+package io.appium.java_client.pagefactory_tests.widget.tests.combined;
+
+import io.appium.java_client.pagefactory.SelendroidFindBy;
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractWidget;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class DefaultSelendroidWidget extends AbstractWidget {
+
+    @SelendroidFindBy(linkText = "SELENDROID_SOME_SUB_LOCATOR")
+    private DefaultSelendroidWidget singleWidget;
+
+    @SelendroidFindBy(linkText = "SELENDROID_SOME_SUB_LOCATOR")
+    private List<DefaultSelendroidWidget> multipleWidgets;
+
+    protected DefaultSelendroidWidget(WebElement element) {
+        super(element);
+    }
+
+    @Override
+    public DefaultSelendroidWidget getSubWidget() {
+        return singleWidget;
+    }
+
+    @Override
+    public List<DefaultSelendroidWidget> getSubWidgets() {
+        return multipleWidgets;
+    }
+}

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/IosApp.java

@@ -1,14 +1,12 @@
 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 io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
 
 import java.util.List;
 
-public class IosApp extends AbstractApp{
+public class IosApp implements ExtendedApp {
 
     public static String IOS_DEFAULT_WIDGET_LOCATOR = "SOME_IOS_DEFAULT_LOCATOR";
     public static String IOS_XCUIT_WIDGET_LOCATOR = "SOME_XCUIT_DEFAULT_LOCATOR";

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsApp.java

@@ -3,10 +3,11 @@
 import io.appium.java_client.pagefactory.WindowsFindBy;
 import io.appium.java_client.pagefactory.iOSXCUITFindBy;
 import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
+import io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
 
 import java.util.List;
 
-public class WindowsApp extends AbstractApp{
+public class WindowsApp implements ExtendedApp {
 
     public static String WINDOWS_DEFAULT_WIDGET_LOCATOR = "SOME_WINDOWS_DEFAULT_LOCATOR";