July Ui maintenance (#1870)

July UI Maintenance, some cross cloud tests have a second speed bump, 2
MAM_CA tests fail on daily build due to version check (our daily
versions start with 0.0, seems ESTS has some check to block sign ins on
these versions for MAM_CA, to fix, we'd have to bump our daily versions
past 0.0)

Pre-requisite:
https://github.com/AzureAD/microsoft-authentication-library-common-for-android/compare/fadi/july-ui?expand=1

Author: fadidurah

common

@@ -57,7 +57,6 @@
 // End My Shift - In Shared device mode, only account from the same tenant should be able to acquire token.
 // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833513
 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class, BrokerHost.class})
-@RetryOnFailure(retryCount = 2)
 @RunOnAPI29Minus("Checking for text error in WebView")
 public class TestCase833513 extends AbstractMsalBrokerTest {
 
@@ -117,7 +116,8 @@ public void test_833513() throws MsalException, InterruptedException, LabApiExce
                 .broker(mBroker)
                 .prompt(PromptParameter.SELECT_ACCOUNT)
                 .expectingBrokerAccountChooserActivity(false)
-                .howWouldYouLikeToSignInExpected(false)
+                .howWouldYouLikeToSignInExpected(true)
+                .chooseCertificateExpected(true)
                 .build();
 
         AdfsPromptHandler adfsPromptHandler = new AdfsPromptHandler(promptHandlerParameters);

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

@@ -31,6 +31,7 @@
 import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk;
 import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest;
 import com.microsoft.identity.client.ui.automation.TestContext;
+import com.microsoft.identity.client.ui.automation.annotations.FailsWithDailyVersions;
 import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure;
 import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired;
 import com.microsoft.identity.client.ui.automation.TokenRequestTimeout;
@@ -55,6 +56,7 @@
 // "Add another account" option in Account Chooser Activity
 // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/796050
 @RetryOnFailure(retryCount = 2)
+@FailsWithDailyVersions("ESTS Seems to have a check against 0.0.X versions for MAM CA")
 public class TestCase796050 extends AbstractMsalBrokerTest {
 
     @Test

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase796050.java

@@ -31,6 +31,7 @@
 import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest;
 import com.microsoft.identity.client.ui.automation.TestContext;
 import com.microsoft.identity.client.ui.automation.TokenRequestTimeout;
+import com.microsoft.identity.client.ui.automation.annotations.FailsWithDailyVersions;
 import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure;
 import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters;
 import com.microsoft.identity.client.ui.automation.interaction.PromptParameter;
@@ -46,6 +47,7 @@
 // [Joined][MSAL] Acquire Token + Acquire Token Silent with resource (Prompt.SELECT_ACCOUNT)
 // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/832430
 @RetryOnFailure(retryCount = 2)
+@FailsWithDailyVersions("ESTS Seems to have a check against 0.0.X versions for MAM CA")
 public class TestCase832430 extends AbstractMsalBrokerTest {
 
     @Test

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase832430.java

@@ -43,7 +43,6 @@
 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.msal.automationapp.testpass.broker.AbstractMsalBrokerTest
 import com.microsoft.identity.client.ui.automation.TokenRequestTimeout
 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.client.ui.automation.interaction.PromptParameter
@@ -53,6 +54,7 @@ import org.junit.rules.TestRule
 // [MWPJ] After entry migration PRT is still usable without extra prompts.
 @LocalBrokerHostDebugUiTest
 @SupportedBrokers(brokers = [BrokerHost::class])
+@RetryOnFailure
 class TestCase2579654 : AbstractMsalBrokerTest() {
 
     private lateinit var mUsGovAccount: ILabAccount

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2579654.kt

@@ -112,7 +112,6 @@ public void handleUserInteraction() {
                         .sessionExpected(true)
                         .consentPageExpected(false)
                         .speedBumpExpected(true)
-                        .speedBumpResponse(UiResponse.ACCEPT)
                         .build();
 
                 new AadPromptHandler(promptHandlerParameters)

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase497038.java

@@ -46,7 +46,7 @@
 // Interactive Auth with select_account (no consent record)
 // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/99267
 @RunOnAPI29Minus("Consent Page")
-@RetryOnFailure(retryCount = 2)
+@RetryOnFailure
 public class TestCase99267 extends AbstractMsalUiTest {
 
     @Test

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99267.java

@@ -46,7 +46,7 @@
 // Interactive Auth with select_account (with consent record)
 // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/99274
 @RunOnAPI29Minus("Consent Page")
-@RetryOnFailure
+@RetryOnFailure(retryCount = 2)
 public class TestCase99274 extends AbstractMsalUiTest {
 
     @Test

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99274.java

@@ -97,6 +97,7 @@ public void test_1420484() throws Throwable {
                     .loginHint(userName)
                     .staySignedInPageExpected(GlobalConstants.IS_STAY_SIGN_IN_PAGE_EXPECTED)
                     .speedBumpExpected(true)
+                    .secondSpeedBumpExpected(GlobalConstants.IS_EXPECTING_SECOND_SPEED_BUMP)
                     .build();
             final AadPromptHandler promptHandler = new AadPromptHandler(promptHandlerParameters);
             promptHandler.handlePrompt(userName, password);