Add -android datamatcher selector strategy

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/Clear.java

@@ -16,11 +16,10 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.PerformException;
-import androidx.test.espresso.ViewInteraction;
-
 import javax.annotation.Nullable;
 
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.ViewInteraction;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException;
 import io.appium.espressoserver.lib.model.AppiumParams;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/Click.java

@@ -16,11 +16,10 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.PerformException;
-import androidx.test.espresso.ViewInteraction;
-
 import javax.annotation.Nullable;
 
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.ViewInteraction;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException;
 import io.appium.espressoserver.lib.model.AppiumParams;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/DrawerActionHandler.java

@@ -16,22 +16,12 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import java.util.regex.Pattern;
-
 import androidx.test.espresso.EspressoException;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.contrib.DrawerActions;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.model.DrawerActionParams;
 import io.appium.espressoserver.lib.model.Element;
-import io.appium.espressoserver.lib.model.ToastLookupParams;
-import io.appium.espressoserver.lib.viewmatcher.ToastMatcher;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static io.appium.espressoserver.lib.viewmatcher.RegexpTextMatcher.withRegexp;
 
 public class DrawerActionHandler implements RequestHandler<DrawerActionParams, Void> {
     private final boolean isOpenAction;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/ElementValue.java

@@ -1,10 +1,10 @@
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.ViewInteraction;
 import android.view.View;
 import android.widget.NumberPicker;
 import android.widget.ProgressBar;
 
+import androidx.test.espresso.ViewInteraction;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException;
 import io.appium.espressoserver.lib.model.Element;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetAttribute.java

@@ -1,13 +1,13 @@
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.ViewInteraction;
 import android.view.View;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nullable;
 
+import androidx.test.espresso.ViewInteraction;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.handlers.exceptions.NotYetImplementedException;
 import io.appium.espressoserver.lib.model.AppiumParams;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetEnabled.java

@@ -20,7 +20,6 @@
 
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewInteraction;
-
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.model.AppiumParams;
 import io.appium.espressoserver.lib.model.Element;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetSelected.java

@@ -20,7 +20,6 @@
 
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewInteraction;
-
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.model.AppiumParams;
 import io.appium.espressoserver.lib.model.Element;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/HideKeyboard.java

@@ -17,7 +17,6 @@
 package io.appium.espressoserver.lib.handlers;
 
 import androidx.test.espresso.Espresso;
-
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.model.AppiumParams;
 

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/Keys.java

@@ -16,12 +16,11 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.UiController;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.test.espresso.UiController;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.helpers.w3c.adapter.espresso.EspressoW3CActionAdapter;
 import io.appium.espressoserver.lib.helpers.w3c.models.Actions;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/MobileClickAction.kt

@@ -18,8 +18,8 @@ package io.appium.espressoserver.lib.handlers
 
 import androidx.test.espresso.action.GeneralClickAction
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
-import io.appium.espressoserver.lib.model.MobileClickActionParams
 import io.appium.espressoserver.lib.model.Element
+import io.appium.espressoserver.lib.model.MobileClickActionParams
 import io.appium.espressoserver.lib.viewaction.UiControllerPerformer
 import io.appium.espressoserver.lib.viewaction.UiControllerRunnable
 

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/MobileSwipe.kt

@@ -17,17 +17,12 @@
 package io.appium.espressoserver.lib.handlers
 
 import androidx.test.espresso.action.GeneralSwipeAction
-
+import androidx.test.espresso.action.ViewActions.*
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
+import io.appium.espressoserver.lib.helpers.AndroidLogger.logger
 import io.appium.espressoserver.lib.model.Element
 import io.appium.espressoserver.lib.model.MobileSwipeParams
-
-import androidx.test.espresso.action.ViewActions.swipeDown
-import androidx.test.espresso.action.ViewActions.swipeLeft
-import androidx.test.espresso.action.ViewActions.swipeRight
-import androidx.test.espresso.action.ViewActions.swipeUp
-import io.appium.espressoserver.lib.helpers.AndroidLogger.logger
 import io.appium.espressoserver.lib.model.MobileSwipeParams.Direction.*
 import io.appium.espressoserver.lib.viewaction.UiControllerPerformer
 import io.appium.espressoserver.lib.viewaction.UiControllerRunnable

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/MoveTo.java

@@ -18,7 +18,6 @@
 
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.ViewInteraction;
-
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.model.Element;
 import io.appium.espressoserver.lib.model.MoveToParams;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/MultiTouchAction.java

@@ -1,9 +1,8 @@
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.UiController;
-
 import java.util.List;
 
+import androidx.test.espresso.UiController;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.helpers.w3c.adapter.espresso.EspressoW3CActionAdapter;
 import io.appium.espressoserver.lib.helpers.w3c.models.Actions;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/NavigateTo.java

@@ -19,13 +19,9 @@
 import androidx.test.espresso.EspressoException;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.contrib.NavigationViewActions;
-import androidx.test.espresso.contrib.PickerActions;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
-import io.appium.espressoserver.lib.helpers.AndroidLogger;
 import io.appium.espressoserver.lib.model.Element;
 import io.appium.espressoserver.lib.model.NavigateToParams;
-import io.appium.espressoserver.lib.model.ScrollToPageParams;
-import io.appium.espressoserver.lib.model.SetTimeParams;
 
 public class NavigateTo implements RequestHandler<NavigateToParams, Void> {
 

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/PerformAction.java

@@ -1,7 +1,6 @@
 package io.appium.espressoserver.lib.handlers;
 
 import androidx.test.espresso.UiController;
-
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.helpers.w3c.adapter.espresso.EspressoW3CActionAdapter;
 import io.appium.espressoserver.lib.helpers.w3c.models.Actions;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/PressKeyCode.java

@@ -17,12 +17,12 @@
 package io.appium.espressoserver.lib.handlers;
 
 import android.os.SystemClock;
-import androidx.test.espresso.InjectEventSecurityException;
-import androidx.test.espresso.UiController;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.ViewConfiguration;
 
+import androidx.test.espresso.InjectEventSecurityException;
+import androidx.test.espresso.UiController;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException;
 import io.appium.espressoserver.lib.model.KeyEventParams;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/ReleaseActions.java

@@ -1,7 +1,6 @@
 package io.appium.espressoserver.lib.handlers;
 
 import androidx.test.espresso.UiController;
-
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.helpers.w3c.models.Actions;
 import io.appium.espressoserver.lib.model.AppiumParams;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/ScreenshotHandler.java

@@ -16,13 +16,6 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import android.graphics.Bitmap;
-import android.util.Base64;
-
-import java.io.ByteArrayOutputStream;
-
-import androidx.test.runner.screenshot.ScreenCapture;
-import androidx.test.runner.screenshot.Screenshot;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.helpers.ScreenshotsHelper;
 import io.appium.espressoserver.lib.model.AppiumParams;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/SendKeys.java

@@ -16,12 +16,12 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.PerformException;
-import androidx.test.espresso.ViewInteraction;
 import android.view.View;
 import android.widget.NumberPicker;
 import android.widget.ProgressBar;
 
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.ViewInteraction;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException;
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/SetOrientation.java

@@ -16,19 +16,19 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.ViewInteraction;
-import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
-import static androidx.test.espresso.Espresso.onView;
-
 import java.util.Arrays;
 
 import javax.annotation.Nullable;
 
+import androidx.test.espresso.ViewInteraction;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.model.Element;
 import io.appium.espressoserver.lib.model.OrientationParams;
 import io.appium.espressoserver.lib.viewaction.OrientationChange;
 
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+
 public class SetOrientation implements RequestHandler<OrientationParams, Void> {
 
     @Override

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/Text.java

@@ -16,10 +16,9 @@
 
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.ViewInteraction;
-
 import javax.annotation.Nullable;
 
+import androidx.test.espresso.ViewInteraction;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.model.AppiumParams;
 import io.appium.espressoserver.lib.model.Element;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/TouchAction.java

@@ -1,10 +1,9 @@
 package io.appium.espressoserver.lib.handlers;
 
-import androidx.test.espresso.UiController;
-
 import java.util.Collections;
 import java.util.List;
 
+import androidx.test.espresso.UiController;
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException;
 import io.appium.espressoserver.lib.helpers.w3c.adapter.espresso.EspressoW3CActionAdapter;
 import io.appium.espressoserver.lib.helpers.w3c.models.Actions;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/WebAtoms.kt

@@ -17,15 +17,15 @@
 package io.appium.espressoserver.lib.handlers
 
 import androidx.test.espresso.web.sugar.Web.WebInteraction
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
-import io.appium.espressoserver.lib.model.web.WebAtomsParams
 import androidx.test.espresso.web.sugar.Web.onWebView
 import androidx.test.espresso.web.webdriver.DriverAtoms
+import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
 import io.appium.espressoserver.lib.helpers.AndroidLogger.logger
 import io.appium.espressoserver.lib.helpers.KReflectionUtils.invokeInstanceMethod
 import io.appium.espressoserver.lib.helpers.KReflectionUtils.invokeMethod
 import io.appium.espressoserver.lib.model.Element
+import io.appium.espressoserver.lib.model.web.WebAtomsParams
 import io.appium.espressoserver.lib.viewmatcher.WithView.withView
 
 class WebAtoms : RequestHandler<WebAtomsParams, Void> {
@@ -38,7 +38,7 @@ class WebAtoms : RequestHandler<WebAtomsParams, Void> {
 
         // Initialize onWebView with web view matcher (if webviewEl provided)
         webAtomsParams.webviewElement.let{
-            logger.info("Initializing webView interaction on webview with el: '${it}")
+            logger.info("Initializing webView interaction on webview with el: '${it}'")
             val matcher = withView(Element.getViewById(it))
             webViewInteraction = onWebView(matcher)
         }
@@ -50,11 +50,11 @@ class WebAtoms : RequestHandler<WebAtomsParams, Void> {
 
         // Iterate through methodsChain and call the atoms
         for (method in webAtomsParams.methodChain) {
-            val atom = invokeMethod(DriverAtoms::class, method.atom.name, *method.atom.args.toTypedArray());
+            val atom = invokeMethod(DriverAtoms::class, method.atom.name, *method.atom.args);
 
             logger.info("Calling interaction '${method.name}' with the atom '${method.atom}'")
-            val args = if (atom == null) emptyList<Any>() else atom;
-            val res = invokeInstanceMethod(webViewInteraction, method.name, args);
+            val args: Array<Any?> = if (atom == null) emptyArray() else arrayOf(atom)
+            val res = invokeInstanceMethod(webViewInteraction, method.name, *args)
 
             if (!(res is WebInteraction<*>)) {
                 throw InvalidArgumentException("'${method.name}' does not return a 'WebViewInteraction' object");

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/helpers/AlertHelpers.java

@@ -16,7 +16,6 @@
 
 package io.appium.espressoserver.lib.helpers;
 
-import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -28,6 +27,7 @@
 import java.util.Objects;
 import java.util.regex.Pattern;
 
+import androidx.annotation.Nullable;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiObject2;
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException;

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/helpers/DeviceInfoHelper.java

@@ -20,12 +20,13 @@
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings.Secure;
-import androidx.annotation.Nullable;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 public class DeviceInfoHelper {
     private final Context context;