Seems UI is still hopping between legacy msa ui and fluent ui, changes to support both, Fixes AB#3246594 (#2634)

It seems that the fluent ui at the time of writing this PR (4/29/2025)
is still not fully complete, some manual testing showed that the legacy
ui and fluent ui are still appearing at random points. This PR will make
a change using regex to support both UI's and pass the test regardless
of which UI we get.


[AB#3246594](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3246594)

Author: fadidurah

uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AadLoginComponentHandler.java

@@ -58,7 +58,7 @@ public class AadLoginComponentHandler implements IMicrosoftStsLoginComponentHand
     private final long mFindLoginUiElementTimeout;
 
     public AadLoginComponentHandler() {
-        mFindLoginUiElementTimeout = CommonUtils.FIND_UI_ELEMENT_TIMEOUT_SHORT;
+        mFindLoginUiElementTimeout = CommonUtils.FIND_UI_ELEMENT_TIMEOUT;
     }
 
     /**
@@ -74,22 +74,21 @@ public void handleEmailField(@NonNull final String username) {
             UiAutomatorUtils.handleInput("i0116", username, mFindLoginUiElementTimeout);
             handleNextButton();
         } catch (AssertionError e) {
-            // If we can't find email field, we can try without resource id
-            UiAutomatorUtils.handleInputByClass("android.widget.EditText", username);
+            UiAutomatorUtils.handleInputByClass("android.widget.EditText", username, mFindLoginUiElementTimeout);
             handleNextButtonByText();
         }
     }
 
     @Override
     public void handlePasswordField(@NonNull final String password) {
         Logger.i(TAG, "Handle Aad Login Password UI..");
+        UiAutomatorUtils.obtainUiObjectWithText("password", mFindLoginUiElementTimeout);
         try {
+            UiAutomatorUtils.handleInputByClass("android.widget.EditText", password, mFindLoginUiElementTimeout);
+            handleNextOrSignInButtonByRegex();
+        } catch (AssertionError e) {
             UiAutomatorUtils.handleInput("i0118", password, mFindLoginUiElementTimeout);
             handleNextButton();
-        } catch (AssertionError e) {
-            // If we can't find password field, we can try without resource id
-            UiAutomatorUtils.handleInputByClass("android.widget.EditText", password);
-            handleSignInButtonByText();
         }
     }
 
@@ -119,6 +118,10 @@ public void handleRegistrationButton() {
         UiAutomatorUtils.handleButtonClickForObjectWithExactText("Register");
     }
 
+    public void handleNextOrSignInButtonByRegex() {
+        UiAutomatorUtils.handleButtonClickForObjectWithRegexMatch("Next|Sign in");
+    }
+
     @Override
     public void handleAccountPicker(@NonNull final String username) {
         Logger.i(TAG, "Handle Account Picker UI..");

uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/UiAutomatorUtils.java

@@ -127,6 +127,30 @@ public static UiObject obtainUiObjectWithText(@NonNull final String text, final
         );
     }
 
+    /**
+     * Obtain an instance of the UiObject with text matching given regex.
+     *
+     * @param regex the regex pattern to match
+     * @return the UiObject associated to the supplied regex
+     */
+    public static UiObject obtainUiObjectWithRegex(@NonNull final String regex) {
+        Logger.i(TAG, "Obtain an instance of the UiObject with regex pattern:" + regex);
+        return obtainUiObjectWithRegex(regex, FIND_UI_ELEMENT_TIMEOUT);
+    }
+
+    /**
+     * Obtain an instance of the UiObject with text matching given regex.
+     *
+     * @param regex the regex pattern to match
+     * @param existsTimeout time to wait until ui object with text exists.
+     * @return the UiObject associated to the supplied regex
+     */
+    public static UiObject obtainUiObjectWithRegex(@NonNull final String regex, final long existsTimeout) {
+            Logger.i(TAG, "Obtain an instance of the UiObject with regex pattern:" + regex);
+            return obtainUiObjectWithUiSelector(new UiSelector().textMatches(regex),
+                    existsTimeout);
+    }
+
     /**
      * Obtain an instance of the UiObject for the given text.
      *
@@ -164,6 +188,18 @@ public static UiObject obtainUiObjectWithClass(@NonNull final String clazz) {
                 FIND_UI_ELEMENT_TIMEOUT);
     }
 
+    /**
+     * Obtain an instance of the UiObject for the class.
+     *
+     * @param clazz the class name of the element to obtain
+     * @return the UiObject associated to the supplied text
+     */
+    public static UiObject obtainUiObjectWithClass(@NonNull final String clazz, final long existsTimeout) {
+        Logger.i(TAG, "Obtain an instance of the UiObject with class name:" + clazz);
+        return obtainUiObjectWithUiSelector(new UiSelector().className(clazz),
+                existsTimeout);
+    }
+
     /**
      * Obtain an instance of the UiObject for a given resource id.
      *
@@ -327,6 +363,27 @@ public static void handleInputByClass(@NonNull final String clazz,
         }
     }
 
+    /**
+     * Fills the supplied text into the input element of a given class.
+     *
+     * @param clazz classname of the object to give input
+     * @param inputText  the text to enter
+     * @param existsTimeout how long to wait for object to exist
+     */
+    public static void handleInputByClass(@NonNull final String clazz,
+                                          @NonNull final String inputText,
+                                          final long existsTimeout) {
+        Logger.i(TAG, "Handling input for class: " + clazz);
+        final UiObject inputField = obtainUiObjectWithClass(clazz, existsTimeout);
+
+        try {
+            inputField.setText(inputText);
+            closeKeyboardIfNeeded();
+        } catch (final UiObjectNotFoundException e) {
+            throw new AssertionError(e);
+        }
+    }
+
     /**
      * Clicks the button element associated to the supplied resource id.
      *
@@ -455,6 +512,19 @@ public static void handleButtonClickForObjectWithTextSafely(@NonNull final Strin
         }
     }
 
+    /**
+     * Clicks the button element that contains text matching the supplied regex
+     */
+    public static void handleButtonClickForObjectWithRegexMatch(@NonNull final String regex) {
+        final UiObject button = obtainUiObjectWithRegex(regex);
+
+        try {
+            button.click();
+        } catch (final UiObjectNotFoundException e) {
+            Logger.w(TAG, "Button with regex \"" + regex + "\" was not found: " + e.getMessage());
+        }
+    }
+
     /**
      * Presses the device back button on the Android device.
      */