#455 fix. The searching by Windows automation

Author: stoneman

src/main/java/io/appium/java_client/FindsByWindowsAutomation.java

@@ -0,0 +1,41 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package io.appium.java_client;
+
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public interface FindsByWindowsAutomation<T extends WebElement>  {
+
+    /**
+     * Finds the first of elements that match the Windows UIAutomation selector supplied.
+     *
+     * @param selector a Windows UIAutomation selector
+     * @return The first element that matches the given selector
+     */
+    T findElementByWindowsUIAutomation(String selector);
+
+    /**
+     * Finds a list of elements that match the Windows UIAutomation selector supplied.
+     *
+     * @param selector a Windows UIAutomation selector
+     * @return a list of elements that match the given selector
+     */
+    List<T> findElementsByWindowsUIAutomation(String selector);
+}

src/main/java/io/appium/java_client/MobileBy.java

@@ -341,6 +341,58 @@ protected ByIosNsPredicate(String locatorString) {
             return "By.IosNsPredicate: " + getLocatorString();
         }
     }
+
+    public static class ByWindowsAutomation extends MobileBy implements Serializable {
+
+        protected ByWindowsAutomation(String locatorString) {
+            super(MobileSelector.WINDOWS_UI_AUTOMATION, locatorString);
+        }
+
+        /**
+         * @throws WebDriverException when current session doesn't support the given selector or when
+         *      value of the selector is not consistent.
+         * @throws IllegalArgumentException when it is impossible to find something on the given
+         * {@link SearchContext} instance
+         */
+        @SuppressWarnings("unchecked")
+        @Override public List<WebElement> findElements(SearchContext context) {
+            Class<?> contextClass = context.getClass();
+
+            if (FindsByWindowsAutomation.class.isAssignableFrom(contextClass)) {
+                return FindsByWindowsAutomation.class.cast(context)
+                    .findElementsByWindowsUIAutomation(getLocatorString());
+            }
+
+            if (FindsByFluentSelector.class.isAssignableFrom(context.getClass())) {
+                return super.findElements(context);
+            }
+
+            throw formIllegalArgumentException(contextClass, FindsByWindowsAutomation.class,
+                FindsByFluentSelector.class);
+        }
+
+        /**
+         * @throws WebDriverException when current session doesn't support the given selector or when
+         *      value of the selector is not consistent.
+         * @throws IllegalArgumentException when it is impossible to find something on the given
+         * {@link SearchContext} instance
+         */
+        @Override public WebElement findElement(SearchContext context) {
+            Class<?> contextClass = context.getClass();
+
+            if (FindsByWindowsAutomation.class.isAssignableFrom(contextClass)) {
+                return FindsByWindowsAutomation.class.cast(context)
+                    .findElementByWindowsUIAutomation(getLocatorString());
+            }
+
+            if (FindsByFluentSelector.class.isAssignableFrom(context.getClass())) {
+                return super.findElement(context);
+            }
+
+            throw formIllegalArgumentException(contextClass, FindsByIosNSPredicate.class,
+                FindsByWindowsAutomation.class);
+        }
+    }
 }
 
 

src/main/java/io/appium/java_client/MobileSelector.java

@@ -20,7 +20,8 @@ public enum MobileSelector {
     ACCESSIBILITY("accessibility id"),
     ANDROID_UI_AUTOMATOR("-android uiautomator"),
     IOS_UI_AUTOMATION("-ios uiautomation"),
-    IOS_PREDICATE_STRING("-ios predicate string");
+    IOS_PREDICATE_STRING("-ios predicate string"),
+    WINDOWS_UI_AUTOMATION("-windows uiautomation");
 
     private final String selector;