update test code to get guest tenant

Author: fadidurah

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/client/ILabAccount.java

@@ -58,6 +58,13 @@ public interface ILabAccount {
      */
     String getHomeTenantId();
 
+    /**
+     * Get the guest tenant id of this account.
+     *
+     * @return a String representing the account's home tenant id
+     */
+    String getGuestTenantId();
+
     /**
      * Get the object id in home tenant.
      *

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/client/LabAccount.java

@@ -55,6 +55,7 @@ public class LabAccount implements ILabAccount {
     private final String mHomeObjectId;
 
     private final String mAssociatedClientId;
+    private final String mGuestTenantId;
 
     private final String mCloudUrl;
 

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/client/LabClient.java

@@ -371,6 +371,7 @@ public ILabAccount getAccountFromLabJsonStringInMobileBuildVault(UserType userTy
                 .userType(userType)
                 .homeTenantId(accountEntry.getHomeTenantId())
                 .homeObjectId(accountEntry.getHomeObjectId())
+                .guestTenantId(accountEntry.getGuestTenantId())
                 .associatedClientId(accountEntry.getAssociatedClientId())
                 .azureEnvironment(accountEntry.getAzureEnvironment())
                 .cloudUrl(accountEntry.getCloudUrl())

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/client/LabJsonStringAccountEntry.java

@@ -48,6 +48,9 @@ public class LabJsonStringAccountEntry implements Serializable {
     @SerializedName("HomeTenantId")
     private String homeTenantId;
 
+    @SerializedName("GuestTenantId")
+    private String guestTenantId;
+
     @SerializedName("AssociatedClientId")
     private String associatedClientId;
 

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/constants/LabConstants.java

@@ -29,8 +29,8 @@ public class LabConstants {
     public static final String DEFAULT_LAB_SCOPE = "https://request.msidlab.com/.default";
     public static final String KEYVAULT_SCOPE = "https://vault.azure.net/.default";
     public static final String DEFAULT_LAB_CERT_ALIAS = "LabAuth.MSIDLab.com";
-    public static final String MSID_LAB3 = "https://login.microsoftonline.com/msidlab3.com";
-    public static final String MSID_LAB4 = "https://login.microsoftonline.com/msidlab4.com";
+    public static final String ID4SLAB2 = "https://login.microsoftonline.com/id4slab2.onmicrosoft.com";
+    public static final String ID4SLAB1 = "https://login.microsoftonline.com/id4slab1.onmicrosoft.com";
 
     // TODO, REMOVE LEGACY UserTypes WHEN WE REMOVE LAB QUERY USAGE
     static final class UserType {
@@ -47,6 +47,7 @@ static final class UserType {
         public static final String USGOV = "usgov";
         public static final String USGOV_GUEST = "usgov_guest";
         public static final String CHINA = "china";
+        public static final String CHINA_GUEST = "china_guest";
         public static final String QR_PIN = "qr_pin";
         public static final String TOKEN_BINDING = "token_binding";
         public static final String CBA = "cba";

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/constants/UserType.java

@@ -37,6 +37,7 @@ public enum UserType {
     USGOV(LabConstants.UserType.USGOV),
     USGOV_GUEST(LabConstants.UserType.USGOV_GUEST),
     CHINA(LabConstants.UserType.CHINA),
+    CHINA_GUEST(LabConstants.UserType.CHINA_GUEST),
     QR_PIN(LabConstants.UserType.QR_PIN),
     TOKEN_BINDING(LabConstants.UserType.TOKEN_BINDING),
     CBA(LabConstants.UserType.CBA),

uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/BrokerMicrosoftAuthenticator.java

@@ -24,6 +24,8 @@
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
+import static com.microsoft.identity.client.ui.automation.utils.CommonUtils.FIND_UI_ELEMENT_TIMEOUT_SHORT;
+
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -398,7 +400,7 @@ public void handleFirstRun() {
             // the skip button
             UiAutomatorUtils.handleButtonClick("com.azure.authenticator:id/frx_skip_button");
             // This is required for auth app as it has increased the compile sdk version to 34
-            UiAutomatorUtils.handleButtonClickForObjectWithTextSafely("NOT NOW");
+            UiAutomatorUtils.handleButtonClickForObjectWithTextSafely("NOT NOW", FIND_UI_ELEMENT_TIMEOUT_SHORT);
             shouldHandleFirstRun = false;
         }
     }

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

@@ -550,6 +550,16 @@ public static void handleButtonClickForObjectWithTextSafely(@NonNull final Strin
         }
     }
 
+    public static void handleButtonClickForObjectWithTextSafely(@NonNull final String text, final long existsTimeout) {
+        final UiObject button = obtainUiObjectWithText(text, existsTimeout);
+
+        try {
+            button.click();
+        } catch (final UiObjectNotFoundException e) {
+            Logger.w(TAG, "Button with text \"" + text + "\" was not found: " + e.getMessage());
+        }
+    }
+
     /**
      * Clicks the button element that contains text matching the supplied regex
      */