Update capabilities to support mobile browsers

sbabcoc · sbabcoc · commit c4623aa72ab2 · 2025-05-05T22:20:20.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -238,8 +238,8 @@ repositories {
 dependencies {
   constraints {
     api 'com.nordstrom.tools:java-utils:3.4.1'
-    api 'com.nordstrom.tools:settings:3.0.7'
-    api 'com.nordstrom.tools:junit-foundation:17.2.2'
+    api 'com.nordstrom.tools:settings:3.0.8'
+    api 'com.nordstrom.tools:junit-foundation:17.2.4'
     api 'com.github.sbabcoc:logback-testng:2.0.1'
     api 'org.hamcrest:hamcrest-core:3.0'
     api 'org.yaml:snakeyaml:2.4'
diff --git a/selenium3Deps.gradle b/selenium3Deps.gradle
@@ -24,7 +24,7 @@ sourceSets {
   
 dependencies {
   constraints {
-    api 'com.nordstrom.tools:testng-foundation:5.1.3-j8'
+    api 'com.nordstrom.tools:testng-foundation:5.2.1-j8'
     api 'org.seleniumhq.selenium:selenium-server:3.141.59'
     api 'org.seleniumhq.selenium:selenium-support:3.141.59'
     api 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
diff --git a/selenium4Deps.gradle b/selenium4Deps.gradle
@@ -24,15 +24,15 @@ sourceSets {
   
 dependencies {
   constraints {
-    api 'com.nordstrom.tools:testng-foundation:5.1.3-j11'
-    api 'org.seleniumhq.selenium:selenium-grid:4.30.0'
-    api 'org.seleniumhq.selenium:selenium-support:4.30.0'
-    api 'org.seleniumhq.selenium:selenium-chrome-driver:4.30.0'
-    api 'org.seleniumhq.selenium:selenium-edge-driver:4.30.0'
-    api 'org.seleniumhq.selenium:selenium-firefox-driver:4.30.0'
+    api 'com.nordstrom.tools:testng-foundation:5.2.1-j11'
+    api 'org.seleniumhq.selenium:selenium-grid:4.32.0'
+    api 'org.seleniumhq.selenium:selenium-support:4.32.0'
+    api 'org.seleniumhq.selenium:selenium-chrome-driver:4.32.0'
+    api 'org.seleniumhq.selenium:selenium-edge-driver:4.32.0'
+    api 'org.seleniumhq.selenium:selenium-firefox-driver:4.32.0'
     api 'org.seleniumhq.selenium:selenium-opera-driver:4.4.0'
-    api 'org.seleniumhq.selenium:selenium-safari-driver:4.30.0'
-    api 'com.nordstrom.ui-tools:htmlunit-remote:4.30.0'
+    api 'org.seleniumhq.selenium:selenium-safari-driver:4.32.0'
+    api 'com.nordstrom.ui-tools:htmlunit-remote:4.30.1'
     api 'org.seleniumhq.selenium:htmlunit3-driver:4.30.0'
     api 'org.htmlunit:htmlunit:4.11.1'
     api 'com.codeborne:phantomjsdriver:1.5.0'
diff --git a/src/main/java/com/nordstrom/automation/selenium/core/GridUtility.java b/src/main/java/com/nordstrom/automation/selenium/core/GridUtility.java
@@ -310,7 +310,7 @@ public static HttpHost extractHost(URL url) {
      * @return IP address for the machine we're running on (a.k.a. - 'localhost')
      */
     public static String getLocalHost() {
-        return IDENTITY.getNonLoopbackAddressOfThisMachine();
+        return IDENTITY.getIp4NonLoopbackAddressOfThisMachine().getHostAddress();
     }
     
     /**
diff --git a/src/main/java/com/nordstrom/automation/selenium/core/JsUtility.java b/src/main/java/com/nordstrom/automation/selenium/core/JsUtility.java
@@ -55,7 +55,7 @@
  *         // Execute script as anonymous function, passing specified argument
  *         WebElement response = JsUtility.runAndReturn(driver, script, name);
  *         // If element reference was returned, extract 'content' attribute
- *         return (response == null) ? null : response.getAttribute("content");
+ *         return (response == null) ? null : WebDriverUtils.getDomAttributeOf(response, "content");
  *     }
  * }</code></pre>
  * 
@@ -64,7 +64,7 @@
  * 
  * <pre><code> var found = document.getElementsByTagName("meta");
  * for (var i = 0; i &lt; found.length; i++) {
- *     if (found[i].getAttribute("name") == arguments[0]) return found[i];
+ *     if (WebDriverUtils.getDomAttributeOf(found[i], "name") == arguments[0]) return found[i];
  * }
  * return null;</code></pre>
  */
diff --git a/src/main/java/com/nordstrom/automation/selenium/examples/ExamplePage.java b/src/main/java/com/nordstrom/automation/selenium/examples/ExamplePage.java
@@ -362,7 +362,7 @@ public boolean setInputValue(boolean value) {
      * @return input field value
      */
     public String getInputValue() {
-        return findElement(Using.INPUT).getAttribute("value");
+        return getDomPropertyOfElement(Using.INPUT, "value");
     }
     
     /**
diff --git a/src/main/java/com/nordstrom/automation/selenium/examples/ShadowRootComponent.java b/src/main/java/com/nordstrom/automation/selenium/examples/ShadowRootComponent.java
@@ -110,7 +110,7 @@ public boolean setInputValue(String value) {
      * @return input field value
      */
     public String getInputValue() {
-        return findElement(Using.INPUT).getAttribute("value");
+        return getDomPropertyOfElement(Using.INPUT, "value");
     }
     
     /**
diff --git a/src/main/java/com/nordstrom/automation/selenium/examples/TableComponent.java b/src/main/java/com/nordstrom/automation/selenium/examples/TableComponent.java
@@ -7,6 +7,7 @@
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
 
+import com.nordstrom.automation.selenium.core.WebDriverUtils;
 import com.nordstrom.automation.selenium.model.ComponentContainer;
 import com.nordstrom.automation.selenium.model.PageComponent;
 import com.nordstrom.automation.selenium.model.RobustWebElement;
@@ -115,7 +116,7 @@ private List<TableRowComponent> getTableRows() {
      * @return table component key
      */
     public static Object getKey(SearchContext context) {
-        return ((WebElement) context).getAttribute("id");
+        return WebDriverUtils.getDomAttributeOf((WebElement) context, "id");
     }
 
     /**
diff --git a/src/main/java/com/nordstrom/automation/selenium/model/ComponentContainer.java b/src/main/java/com/nordstrom/automation/selenium/model/ComponentContainer.java
@@ -373,6 +373,50 @@ public RobustWebElement findOptional(final By by) {
         return (RobustWebElement) RobustElementFactory.getElement(this, by, RobustElementWrapper.OPTIONAL);
     }
     
+    /**
+     * Get the value of the named DOM property of the first WebElement matching the specified locator constant.
+     * 
+     * @param constant the locator constant
+     * @param name the name of the property
+     * @return the property's current value or {@code null} if the value is not set
+     */
+    public String getDomPropertyOfElement(final ByEnum constant, final String name) {
+        return getDomPropertyOfElement(constant.locator(), name);
+    }
+    
+    /**
+     * Get the value of the named DOM property of the first WebElement matching the specified locator.
+     * 
+     * @param by the locating mechanism
+     * @param name the name of the property
+     * @return the property's current value or {@code null} if the value is not set
+     */
+    public String getDomPropertyOfElement(final By by, final String name) {
+        return WebDriverUtils.getDomPropertyOf(findElement(by), name);
+    }
+    
+    /**
+     * Get the value of the named DOM attribute of the first WebElement matching the specified locator constant.
+     * 
+     * @param constant the locator constant
+     * @param name the name of the attribute
+     * @return the attribute's value or {@code null} if the value is not set
+     */
+    public String getDomAttributeOfElement(final ByEnum constant, final String name) {
+        return getDomAttributeOfElement(constant.locator(), name);
+    }
+    
+    /**
+     * Get the value of the named DOM attribute of the first WebElement matching the specified locator.
+     * 
+     * @param by the locating mechanism
+     * @param name the name of the attribute
+     * @return the attribute's value or {@code null} if the value is not set
+     */
+    public String getDomAttributeOfElement(final By by, final String name) {
+        return WebDriverUtils.getDomAttributeOf(findElement(by), name);
+    }
+    
     /**
      * Get the driver object associated with this container.
      * 
@@ -394,7 +438,7 @@ public static boolean updateValue(final WebElement element, final boolean value)
         Objects.requireNonNull(element, ELEMENT_MESSAGE);
         
         String tagName = element.getTagName().toLowerCase();
-        if ("input".equals(tagName) && "checkbox".equals(element.getAttribute("type"))) {
+        if ("input".equals(tagName) && "checkbox".equals(WebDriverUtils.getDomAttributeOf(element, "type"))) {
             if (element.isSelected() != value) {
                 element.click();
                 return true;
@@ -418,15 +462,15 @@ public static boolean updateValue(final WebElement element, final String value)
         
         String tagName = element.getTagName().toLowerCase();
         if ("input".equals(tagName)) {
-            if ("checkbox".equals(element.getAttribute("type"))) {
+            if ("checkbox".equals(WebDriverUtils.getDomAttributeOf(element, "type"))) {
                 return updateValue(element, Boolean.parseBoolean(value));
             } else if (!valueEquals(element, value)) {
                 if (WebDriverUtils.isJavascriptEnabled(element)) {
                     JsUtility.run(WebDriverUtils.getDriver(element), UPDATE_VALUE,
                             element, (value != null) ? value : "");
                 } else {
                     StringBuilder keys = new StringBuilder();
-                    String exist = element.getAttribute("value");
+                    String exist = WebDriverUtils.getDomPropertyOf(element, "value");
                     if (!(exist == null || exist.isEmpty())) {
                         keys.append(Keys.END);
                         for (int i = 0; i < exist.length(); i++) {
@@ -457,7 +501,7 @@ public static boolean updateValue(final WebElement element, final String value)
     private static boolean valueEquals(final WebElement element, final String value) {
         Objects.requireNonNull(element, ELEMENT_MESSAGE);
         
-        String exist = element.getAttribute("value");
+        String exist = WebDriverUtils.getDomPropertyOf(element, "value");
         return (exist != null) ? exist.equals(value) : (value == null);
     }
     
@@ -599,6 +643,7 @@ public <T extends Page> T openPageAtUrl(final Class<T> pageClass, final String u
      * @param url target URL or activity
      * @param driver driver object
      */
+    @SuppressWarnings("serial")
     public static void getUrl(final String url, final WebDriver driver) {
         Objects.requireNonNull(url, "[url] must be non-null");
         Objects.requireNonNull(driver, "[driver] must be non-null");
diff --git a/src/main/java/com/nordstrom/automation/selenium/platform/TargetType.java b/src/main/java/com/nordstrom/automation/selenium/platform/TargetType.java
@@ -30,9 +30,9 @@ public enum TargetType implements TargetTypeName {
     
     /**
      * target: web application<br>
-     * driver: {@link RemoteWebDriverPlugin}
+     * driver: {@link RemoteWebDriverPlugin}, {@link UiAutomator2Plugin}
      */
-    WEB_APP(WEB_APP_NAME, RemoteWebDriverPlugin.class),
+    WEB_APP(WEB_APP_NAME, RemoteWebDriverPlugin.class, UiAutomator2Plugin.class),
     
     /**
      * target: Android application<br>
diff --git a/src/main/java/com/nordstrom/automation/selenium/plugins/UiAutomator2Plugin.java b/src/main/java/com/nordstrom/automation/selenium/plugins/UiAutomator2Plugin.java
@@ -22,21 +22,27 @@ public UiAutomator2Plugin() {
     }
 
     private static final String CAPABILITIES =
-            "{\"appium:automationName\":\"UiAutomator2\",\"platformName\":\"Android\"," +
-             "\"browserName\":\"Chrome\",\"appium:deviceName\":\"Android Emulator\"}";
+            "{\"appium:automationName\":\"UiAutomator2\",\"platformName\":\"Android\"}," +
+            "{\"appium:automationName\":\"UiAutomator2\",\"platformName\":\"Android\",\"browserName\":\"chrome\"}";
     
     private static final String BASELINE =
             "{\"appium:automationName\":\"UiAutomator2\",\"platformName\":\"Android\"," +
              "\"nord:options\":{\"personality\":\"UiAutomator2\"," +
                                 "\"pluginClass\":\"com.nordstrom.automation.selenium.plugins.UiAutomator2Plugin\"}}";
     
+    private static final String CHROME =
+            "{\"appium:automationName\":\"UiAutomator2\",\"platformName\":\"Android\",\"browserName\":\"chrome\"," +
+                    "\"nord:options\":{\"personality\":\"UiAutomator2.chrome\"," +
+                                      "\"pluginClass\":\"com.nordstrom.automation.selenium.plugins.UiAutomator2Plugin\"}}";
+    
     private static final Map<String, String> PERSONALITIES;
     
     private static final String DRIVER_CLASS_NAME = "io.appium.java_client.android.AndroidDriver";
     
     static {
         Map<String, String> personalities = new HashMap<>();
         personalities.put(DRIVER_NAME, BASELINE);
+        personalities.put(DRIVER_NAME + ".chrome", CHROME);
         PERSONALITIES = Collections.unmodifiableMap(personalities);
     }
     
diff --git a/src/main/java/com/nordstrom/automation/selenium/support/Coordinators.java b/src/main/java/com/nordstrom/automation/selenium/support/Coordinators.java
@@ -607,7 +607,7 @@ public static Coordinator<Boolean> textToBePresentInElementValue(final By locato
             @Override
             public Boolean apply(SearchContext context) {
                 try {
-                    String elementText = context.findElement(locator).getAttribute("value");
+                    String elementText = WebDriverUtils.getDomPropertyOf(context.findElement(locator), "value");
                     return elementText != null && elementText.contains(text);
                 } catch (StaleElementReferenceException | NoSuchElementException e) {
                     return null;
@@ -653,7 +653,7 @@ public static Coordinator<Boolean> elementToHaveAttributeValue(final By locator,
             @Override
             public Boolean apply(SearchContext context) {
                 try {
-                    String attrib = context.findElement(locator).getAttribute(attribute);
+                    String attrib = WebDriverUtils.getDomPropertyOf(context.findElement(locator), attribute);
                     if (attrib != null) {
                         return attrib.equals(value);
                     } else {
diff --git a/src/main/java/com/nordstrom/automation/selenium/support/RetryAnalyzer.java b/src/main/java/com/nordstrom/automation/selenium/support/RetryAnalyzer.java
@@ -3,24 +3,21 @@
 import org.openqa.selenium.WebDriverException;
 import org.testng.ITestResult;
 
-import com.nordstrom.automation.testng.RetryManager;
+import com.nordstrom.automation.testng.TestNGRetryAnalyzer;
 
 /**
  * This class implements a Selenium-specific <b>TestNG</b> retry analyzer.
  */
-public class RetryAnalyzer extends RetryManager {
+public class RetryAnalyzer implements TestNGRetryAnalyzer {
     
     /**
      * {@inheritDoc}
      * <p>
      * This implementation deems that a test that fails with an instance of {@link WebDriverException} is re-triable.
      */
     @Override
-    protected boolean isRetriable(ITestResult result) {
-        if (result.getThrowable() instanceof WebDriverException) {
-            return true;
-        }
-        return super.isRetriable(result);
+    public boolean retry(ITestResult result) {
+        return (result.getThrowable() instanceof WebDriverException);
     }
 
 }
diff --git a/src/selenium3/java/com/nordstrom/automation/selenium/core/WebDriverUtils.java b/src/selenium3/java/com/nordstrom/automation/selenium/core/WebDriverUtils.java
@@ -39,10 +39,10 @@ public final class WebDriverUtils {
                                     TimeoutException.class));
     
     private static final Pattern FRAMEWORK_PACKAGE = Pattern.compile(
-                    "^(?:sun\\.reflect|java\\.lang"
-                    + "|org\\.(?:openqa|testng|junit|hamcrest)"
-                    + "|com\\.nordstrom\\.automation\\.selenium)\\.");
-            
+            "^(?:sun\\.reflect|java\\.lang"
+            + "|org\\.(?:openqa|testng|junit|hamcrest)"
+            + "|com\\.nordstrom\\.automation\\.selenium)\\.");
+    
     /**
      * Private constructor to prevent instantiation.
      */
@@ -122,6 +122,30 @@ public static Capabilities getCapabilities(final SearchContext context) {
         return (driver instanceof HasCapabilities) ? ((HasCapabilities) driver).getCapabilities() : null;
     }
 
+    /**
+     * Get the value of the named DOM property of the specified WebElement.
+     * 
+     * @param element the target element
+     * @param name the name of the property
+     * @return the property's current value or {@code null} if the value is not set
+     */
+    public static String getDomPropertyOf(final WebElement element, final String name) {
+        String script = String.format("return arguments[0].%s;", name);
+        return JsUtility.runAndReturn(getDriver(element), script, element);
+    }
+    
+    /**
+     * Get the value of the named DOM attribute of the specified WebElement.
+     * 
+     * @param element the target element
+     * @param name the name of the attribute
+     * @return the attribute's value or {@code null} if the value is not set
+     */
+    public static String getDomAttributeOf(final WebElement element, final String name) {
+        String script = String.format("return arguments[0].getAttribute('%s');", name);
+        return JsUtility.runAndReturn(getDriver(element), script, element);
+    }
+    
     /**
      * Remove hidden elements from specified list.
      * 
diff --git a/src/selenium4/java/com/nordstrom/automation/selenium/SeleniumConfig.java b/src/selenium4/java/com/nordstrom/automation/selenium/SeleniumConfig.java
diff --git a/src/selenium4/java/com/nordstrom/automation/selenium/core/WebDriverUtils.java b/src/selenium4/java/com/nordstrom/automation/selenium/core/WebDriverUtils.java
diff --git a/src/selenium4/java/com/nordstrom/automation/selenium/plugins/AbstractAppiumPlugin.java b/src/selenium4/java/com/nordstrom/automation/selenium/plugins/AbstractAppiumPlugin.java
diff --git a/src/test/java/com/nordstrom/automation/selenium/core/JsUtilityTest.java b/src/test/java/com/nordstrom/automation/selenium/core/JsUtilityTest.java
diff --git a/src/test/resources/META-INF/services/com.nordstrom.automation.testng.TestNGRetryAnalyzer b/src/test/resources/META-INF/services/com.nordstrom.automation.testng.TestNGRetryAnalyzer

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ public static HttpHost extractHost(URL url) {`
`310`	`310`	`* @return IP address for the machine we're running on (a.k.a. - 'localhost')`
`311`	`311`	`*/`
`312`	`312`	`public static String getLocalHost() {`
`313`		`- return IDENTITY.getNonLoopbackAddressOfThisMachine();`
	`313`	`+ return IDENTITY.getIp4NonLoopbackAddressOfThisMachine().getHostAddress();`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public boolean setInputValue(boolean value) {`
`362`	`362`	`* @return input field value`
`363`	`363`	`*/`
`364`	`364`	`public String getInputValue() {`
`365`		`- return findElement(Using.INPUT).getAttribute("value");`
	`365`	`+ return getDomPropertyOfElement(Using.INPUT, "value");`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public boolean setInputValue(String value) {`
`110`	`110`	`* @return input field value`
`111`	`111`	`*/`
`112`	`112`	`public String getInputValue() {`
`113`		`- return findElement(Using.INPUT).getAttribute("value");`
	`113`	`+ return getDomPropertyOfElement(Using.INPUT, "value");`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/**`