April UI Maintenance: Take in common changes to mitigate firebase issues, other test improvements (#1814)

Common PR
AzureAD/microsoft-authentication-library-common-for-android#2029

April UI Maintenance: Take in common changes to mitigate firebase
issues, other test improvements

Aside from common fix, added some retries to some inconsistent tests and
had to ignore a couple tests that are failing at the moment due to
something with the Lab account used (investigating them with Ryan now)

Fixed a brokerapi test case that used brokerhost

Author: fadidurah

common

@@ -8,6 +8,10 @@ if (project.hasProperty("distMsalVersion")) {
 
 android {
 
+    packagingOptions {
+        pickFirst  'META-INF/common4j.kotlin_module'
+    }
+
     compileOptions {
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true

msalautomationapp/build.gradle

@@ -25,6 +25,7 @@
 import com.microsoft.identity.client.msal.automationapp.R;
 import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest;
 import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest;
+import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure;
 import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers;
 import com.microsoft.identity.client.ui.automation.broker.BrokerHost;
 import com.microsoft.identity.labapi.utilities.client.LabQuery;
@@ -36,6 +37,7 @@
 // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1561652
 @SupportedBrokers(brokers = {BrokerHost.class})
 @LocalBrokerHostDebugUiTest
+@RetryOnFailure
 public class TestCase1561652 extends AbstractMsalBrokerTest {
     @Test
     public void test_1561652() {
@@ -47,6 +49,7 @@ public void test_1561652() {
         final String nonce = "testNonce";
         // Get SSO token and decode to confirm nonce
         final String ssoToken = ((BrokerHost) mBroker).acquireSSOToken(nonce);
+
         ((BrokerHost) mBroker).decodeSSOTokenAndVerifyNonce(ssoToken, nonce);
     }
 

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561652.java

@@ -26,6 +26,7 @@
 
 import com.microsoft.identity.client.msal.automationapp.R;
 import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest;
+import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure;
 import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers;
 import com.microsoft.identity.client.ui.automation.broker.BrokerHost;
 import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator;
@@ -39,48 +40,46 @@
 // Invoke each API from non-allowed apps. the request should be blocked.
 // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1600567
 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class})
+@RetryOnFailure
 public class TestCase1600567 extends AbstractMsalBrokerTest {
     @Test
     public void test_1600567() throws Throwable {
         final BrokerHost brokerHost = new BrokerHost();
         brokerHost.install();
         brokerHost.launch();
 
+        brokerHost.brokerApiFragment.launch();
         // verify getAccounts call gives calling app not verified
-        UiAutomatorUtils.obtainChildInScrollable("Get Accounts");
-        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/buttonGetAccounts");
+        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/button_get_accounts");
         brokerHost.confirmCallingAppNotVerified();
 
         // verify removeAccount call gives calling app not verified
         final UiObject usernameTxt = UiAutomatorUtils.obtainChildInScrollable("[email protected]");
         usernameTxt.setText("[email protected]");
         final UiObject removeAccount = UiAutomatorUtils.obtainUiObjectWithResourceId(
-                "com.microsoft.identity.testuserapp:id/buttonRemoveAccount"
+                "com.microsoft.identity.testuserapp:id/button_remove_account"
         );
         removeAccount.click();
         brokerHost.confirmCallingAppNotVerified();
 
         // verify update BRT call gives calling app not verified
         // fill BRT
-        final UiObject brokerRTTxt = UiAutomatorUtils.obtainChildInScrollable("Broker RT");
-        brokerRTTxt.setText("5e0c0ce6-0f40-4738-b2d4-3d83a5a2b555");
+        UiAutomatorUtils.handleInput("com.microsoft.identity.testuserapp:id/edit_text_broker_rt", "5e0c0ce6-0f40-4738-b2d4-3d83a5a2b555");
         // fill home authority
-        final UiObject homeAuthorityTxt = UiAutomatorUtils.obtainChildInScrollable("Home Authority");
-        homeAuthorityTxt.setText("https://login.microsoftonline.com/common");
+        UiAutomatorUtils.handleInput("com.microsoft.identity.testuserapp:id/edit_text_home_authority", "https://login.microsoftonline.com/common");
         // click on update BRT
-        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/buttonUpdateBRT");
+        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/button_update_brt");
         brokerHost.confirmCallingAppNotVerified();
 
+        brokerHost.brokerFlightsFragment.launch();
         // verify setFlights call gives calling app not verified
-        UiAutomatorUtils.obtainChildInScrollable("Update Flights");
-        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/flightProvider_localStorage");
-        UiAutomatorUtils.handleInput("com.microsoft.identity.testuserapp:id/editTextFlights", "{test : true}");
-        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/setFlightsButton");
+        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/flight_provider_local_storage");
+        UiAutomatorUtils.handleInput("com.microsoft.identity.testuserapp:id/edit_text_flights", "{test : true}");
+        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/button_set_flights");
         brokerHost.confirmCallingAppNotVerified();
 
         // verify getFlights call gives calling app not verified
-        final UiObject getFlightsBtn = UiAutomatorUtils.obtainChildInScrollable("Get Flights");
-        getFlightsBtn.click();
+        UiAutomatorUtils.handleButtonClick("com.microsoft.identity.testuserapp:id/button_get_flights");
         brokerHost.confirmCallingAppNotVerified();
     }
 

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1600567.java

@@ -117,7 +117,7 @@ public void test_833513() throws MsalException, InterruptedException, LabApiExce
                 .broker(mBroker)
                 .prompt(PromptParameter.SELECT_ACCOUNT)
                 .expectingBrokerAccountChooserActivity(false)
-                .howWouldYouLikeToSignInExpected(true)
+                .howWouldYouLikeToSignInExpected(false)
                 .build();
 
         AdfsPromptHandler adfsPromptHandler = new AdfsPromptHandler(promptHandlerParameters);

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833513.java

@@ -43,6 +43,7 @@
 import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy;
 import com.microsoft.identity.labapi.utilities.constants.TempUserType;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Arrays;

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase833526.java

@@ -31,6 +31,7 @@
 import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk;
 import com.microsoft.identity.client.ui.automation.TestContext;
 import com.microsoft.identity.client.ui.automation.TokenRequestTimeout;
+import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure;
 import com.microsoft.identity.client.ui.automation.app.IApp;
 import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired;
 import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters;
@@ -46,6 +47,7 @@
 
 // [USGOV][MSAL-ONLY] Acquire token silent with unexpired RT with USGov authority
 // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/938383
+@RetryOnFailure
 public class TestCase938383 extends AbstractMsalUiTest {
 
     @Test