The refactoring of widget tests: WebDriverUnpackUtility is using HasSessionDetails#isBrowser now

and the order of imports was improved

Author: TikhomirovSergey

src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java

@@ -16,6 +16,11 @@
 
 package io.appium.java_client.pagefactory.utils;
 
+import static io.appium.java_client.pagefactory.bys.ContentType.HTML_OR_DEFAULT;
+import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
+import static java.util.Optional.ofNullable;
+
+import io.appium.java_client.HasSessionDetails;
 import io.appium.java_client.pagefactory.bys.ContentType;
 import org.openqa.selenium.ContextAware;
 import org.openqa.selenium.SearchContext;
@@ -84,17 +89,27 @@ public static WebDriver unpackWebDriverFromSearchContext(SearchContext searchCon
      * {@link org.openqa.selenium.ContextAware} and {@link org.openqa.selenium.internal.WrapsDriver}
      */
     public static ContentType getCurrentContentType(SearchContext context) {
-        WebDriver driver = WebDriverUnpackUtility.unpackWebDriverFromSearchContext(context);
-        if (!ContextAware.class.isAssignableFrom(driver.getClass())) { //it is desktop browser
-            return ContentType.HTML_OR_DEFAULT;
-        }
+        return ofNullable(unpackWebDriverFromSearchContext(context)).map(driver -> {
+            if (HasSessionDetails.class.isAssignableFrom(driver.getClass())) {
+                HasSessionDetails hasSessionDetails = HasSessionDetails.class.cast(driver);
 
-        ContextAware contextAware = ContextAware.class.cast(driver);
-        String currentContext = contextAware.getContext();
-        if (currentContext.contains(NATIVE_APP_PATTERN)) {
-            return ContentType.NATIVE_MOBILE_SPECIFIC;
-        }
+                if (hasSessionDetails.isBrowser()) {
+                    return HTML_OR_DEFAULT;
+                }
+                return NATIVE_MOBILE_SPECIFIC;
+            }
+
+            if (!ContextAware.class.isAssignableFrom(driver.getClass())) { //it is desktop browser
+                return HTML_OR_DEFAULT;
+            }
+
+            ContextAware contextAware = ContextAware.class.cast(driver);
+            String currentContext = contextAware.getContext();
+            if (currentContext.contains(NATIVE_APP_PATTERN)) {
+                return NATIVE_MOBILE_SPECIFIC;
+            }
 
-        return ContentType.HTML_OR_DEFAULT;
+            return HTML_OR_DEFAULT;
+        }).orElse(HTML_OR_DEFAULT);
     }
 }

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

@@ -1,14 +1,14 @@
 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.MobileBy.AndroidUIAutomator;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.AndroidApp.ANDROID_DEFAULT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.AndroidApp.ANDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.AnnotatedAndroidWidget.ANDROID_ROOT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.DefaultAndroidWidget.ANDROID_SUB_WIDGET_LOCATOR;
 
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+
 public class AndroidWidgetTest extends WidgetTest {
 
     public AndroidWidgetTest() {

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

@@ -1,14 +1,14 @@
 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;
 
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+
 public class SelendroidWidgetTest extends WidgetTest {
     public SelendroidWidgetTest() {
         super(new AndroidApp(), new AbstractStubWebDriver.StubSelendroidDriver());

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

@@ -1,14 +1,14 @@
 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;
 
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+
 public class IosWidgetTest extends WidgetTest {
 
     public IosWidgetTest() {

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

@@ -1,12 +1,13 @@
 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.*;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.IosApp.IOS_XCUIT_WIDGET_LOCATOR;
+import static io.appium.java_client.pagefactory_tests.widget.tests.ios.IosApp.XCUIT_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
+
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
 
 public class XCUITWidgetTest extends WidgetTest {
 

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

@@ -1,14 +1,14 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.windows;
 
-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.windowsAutomation;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.AnnotatedWindowsWidget.WINDOWS_ROOT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.DefaultWindowsWidget.WINDOWS_SUB_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.WindowsApp.WINDOWS_DEFAULT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.WindowsApp.WINDOWS_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
 
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+
 public class WindowsWidgetTest extends WidgetTest {
 
     public WindowsWidgetTest() {