The refactoring of widget tests: missed parameters of the OverrideWidget are handled now

Author: TikhomirovSergey

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

@@ -19,6 +19,7 @@
 import static io.appium.java_client.pagefactory.WidgetConstructorUtil.findConvenientConstructor;
 import static io.appium.java_client.remote.MobilePlatform.ANDROID;
 import static io.appium.java_client.remote.MobilePlatform.IOS;
+import static io.appium.java_client.remote.MobilePlatform.WINDOWS;
 
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.remote.AutomationName;
@@ -35,6 +36,8 @@ class OverrideWidgetReader {
     private static final String ANDROID_UI_AUTOMATOR = "androidUIAutomator";
     private static final String IOS_UI_AUTOMATION = "iOSUIAutomation";
     private static final String SELENDROID = "selendroid";
+    private static final String IOS_XCUIT_AUTOMATION = "iOSXCUITAutomation";
+    private static final String WINDOWS_AUTOMATION = "windowsAutomation";
 
     @SuppressWarnings("unchecked")
     private static Class<? extends Widget> getConvenientClass(Class<? extends Widget> declaredClass,
@@ -83,10 +86,19 @@ static Class<? extends Widget> getMobileNativeWidgetClass(Class<? extends Widget
             return getConvenientClass(declaredClass, annotatedElement, ANDROID_UI_AUTOMATOR);
         }
 
+        if (IOS.equalsIgnoreCase(transformedPlatform) && AutomationName.IOS_XCUI_TEST
+                .equalsIgnoreCase(transformedAutomation)) {
+            return getConvenientClass(declaredClass, annotatedElement, IOS_XCUIT_AUTOMATION);
+        }
+
         if (IOS.equalsIgnoreCase(transformedPlatform)) {
             return getConvenientClass(declaredClass, annotatedElement, IOS_UI_AUTOMATION);
         }
 
+        if (WINDOWS.equalsIgnoreCase(transformedPlatform)) {
+            return getConvenientClass(declaredClass, annotatedElement, WINDOWS_AUTOMATION);
+        }
+
         return getDefaultOrHTMLWidgetClass(declaredClass, annotatedElement);
     }
 

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

@@ -18,6 +18,7 @@
 
 import static io.appium.java_client.pagefactory.OverrideWidgetReader.getDefaultOrHTMLWidgetClass;
 import static io.appium.java_client.pagefactory.OverrideWidgetReader.getMobileNativeWidgetClass;
+import static java.util.Optional.ofNullable;
 
 import org.openqa.selenium.By;
 
@@ -26,7 +27,6 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
-import java.util.Optional;
 
 public class WidgetByBuilder extends DefaultElementByBuilder {
 
@@ -92,12 +92,12 @@ private By getByFromDeclaredClass(WhatIsNeeded whatIsNeeded) {
     }
 
     @Override protected By buildDefaultBy() {
-        return Optional.ofNullable(super.buildDefaultBy())
+        return ofNullable(super.buildDefaultBy())
                 .orElse(getByFromDeclaredClass(WhatIsNeeded.DEFAULT_OR_HTML));
     }
 
     @Override protected By buildMobileNativeBy() {
-        return Optional.ofNullable(super.buildMobileNativeBy())
+        return ofNullable(super.buildMobileNativeBy())
                 .orElse(getByFromDeclaredClass(WhatIsNeeded.MOBILE_NATIVE));
     }