Skip to content

Commit 1d8bb7d

Browse files
mohitc1rpdome
authored andcommitted
Merge release/5.7.0 to dev (#2200)
Update and enable tests to run in pipeline (#2199) Enabling 2 FLW test cases, which have been disabled to run in pipeline. TestCase833513 - Updated account type and error verification TestCase833515 - Replaced Edge steps with Outlook TestCase1592468 - Removed as this is not valid Ran locally with latest RC builds to verify these are passing. Quick fix to ignore those flaky tests. Will be resolved later. (#2205) Take new common, some ui fixes, Fixes AB#3058394 (#2198) changes: - Combined https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2516613 into https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2516571, test will attempt sign in with just outlook, then AuthApp + outlook, finally install cp then able to sign in. Also covers https://identitydivision.visualstudio.com/Engineering/_workitems/edit/831545 because just tests auth with outlook and CP. - Adjustments to TestCase2516967 for consistency - Take common changes [AB#3058394](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3058394) Add Account Manager Tests, enable reading local flights param in automation apps, Fixes AB#3026183 (#2207) Add Account Manager Tests, enable reading local flights param in automation apps [AB#3026183](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3026183) Migrate URIBuilder to httpcore5, Fixes AB#2909378 (#2203) Part 1 of the work to get rid msebera.httpclient. [AB#2909378](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/2909378) Migrate the usage of uribuilder to httpcore5 Update Native Auth E2E tests to use more reliable inbox code retrieval method, Fixes AB#3037823 (#2211) The original PR: #2189 Work Item: [AB#3037823](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3037823) --------- Co-authored-by: Robert McCahill <[email protected]> Adding more MSA test configs to MsalTestApp (#2209) This PR adds two more config options for MsalTestApp: - WEBVIEW_MSA: Webview selected as auth agent; Allows for MSA and AAD accounts; passkeys enabled - WEBVIEW_PPE_MSA: Webview selected as auth agent; INT MSA and PPE AAD accounts; passkeys enabled Migrate Base64 away from Msebera (in Android), Fixes AB#3077784 (#2210) [AB#3077784](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3077784) merge release/5.8.0 to dev (#2217) Remove email attribute, Fixes AB#3080769 (#2224) Remove "email" from the UserAttribute class. The email address is passed as "username" in the signUp process. Bug item description: https://dev.azure.com/IdentityDivision/Engineering/_workitems/edit/3080769 [AB#3080769](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3080769) Merging Somalaya/release/5.8.2 to dev (#2223) Co-authored-by: iamgusain <[email protected]> Android E2E Sign Up, Fixes AB#3073857 (#2213) Create a draft version instead of an official one: #2212 because the PR is still in the draft version. [AB#3073857](https://dev.azure.com/IdentityDivision/Engineering/_workitems/edit/3073857) Android Test plan: https://identitydivision.visualstudio.com/Engineering/_testPlans/define?planId=3054662&suiteId=3054727 2.1.5 2.1.6 2.1.7 (out of scopes for the Lab environment, include them once the environment is ready) 2.1.8 2.1.9 2.1.10 2.1.11 1.1.2 1.1.5 1.1.10 1.1.11 1.1.12 1.1.13 1.1.14 Add suberror for network errors, Fixes AB#3064171 (#2218) Related: AzureAD/microsoft-authentication-library-common-for-android#2537 Also make sure that MsalClientException returns the sub error code.  [AB#3064171](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3064171) automation app name changes automation app name changes automation app name changes automation app name changes tests with oneAuthTestApp updated use lab query instead of temp user removed temp user rebased and removed unnecessary code updated common ignore unnecessary test retry on failure ignored unnecessary test retry added removed retry removed duplicate retry bringing back erroneously deleted file
1 parent be0d777 commit 1d8bb7d

File tree

14 files changed

+19
-9
lines changed

14 files changed

+19
-9
lines changed

msalautomationapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ android {
5454
defaultConfig {
5555
multiDexEnabled true
5656
namespace = "com.microsoft.identity.client.msal.automationapp"
57-
applicationId "com.msft.identity.client.sample"
57+
applicationId "com.msft.identity.client.msal.automationapp"
5858
minSdkVersion rootProject.ext.automationAppMinSDKVersion
5959
targetSdkVersion rootProject.ext.targetSdkVersion
6060
versionCode 1

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2571345.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
// Samsung GA Coverage
5252
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2571345
5353
@LTWTests
54+
@RetryOnFailure
5455
@RunOnAPI29Minus
5556
@SupportedBrokers(brokers = {BrokerLTW.class})
5657
@RetryOnFailure

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2582292.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
@LTWTests
5454
@RetryOnFailure
5555
@SupportedBrokers(brokers = {BrokerLTW.class})
56+
@RetryOnFailure
5657
public class TestCase2582292 extends AbstractMsalBrokerTest {
5758

5859
@Test

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2582294.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,4 @@ public String getAuthority() {
131131
public int getConfigFileResourceId() {
132132
return R.raw.msal_config_default;
133133
}
134-
}
134+
}

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2584411.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
@SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class})
5555
@RetryOnFailure
5656
@RunWith(Parameterized.class)
57+
@RetryOnFailure
5758
public class TestCase2584411 extends AbstractMsalBrokerTest {
5859
private final UserType mUserType;
5960

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2584412.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
@SupportedBrokers(brokers = {BrokerCompanyPortal.class})
5555
@RetryOnFailure
5656
@RunWith(Parameterized.class)
57+
@RetryOnFailure
5758
public class TestCase2584412 extends AbstractMsalBrokerTest {
5859
private final UserType mUserType;
5960

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/update/TestCaseUpdateAuthenticator.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadP
4141
import com.microsoft.identity.labapi.utilities.client.LabQuery
4242
import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment
4343
import com.microsoft.identity.labapi.utilities.constants.TempUserType
44+
import org.junit.Ignore
4445
import org.junit.Test
4546
import java.util.*
4647

4748
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2516681
4849
@RetryOnFailure
4950
@LTWTests
51+
@Ignore
5052
class TestCaseUpdateAuthenticator : AbstractMsalCustomBrokerInstallationTest() {
5153

5254
@Test

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/update/TestCaseUpdateCompanyPortal.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadP
4141
import com.microsoft.identity.labapi.utilities.client.LabQuery
4242
import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment
4343
import com.microsoft.identity.labapi.utilities.constants.TempUserType
44+
import org.junit.Ignore
4445
import org.junit.Test
4546
import java.util.*
4647

4748
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2516681
49+
@Ignore
4850
@RetryOnFailure
4951
@LTWTests
5052
class TestCaseUpdateCompanyPortal : AbstractMsalCustomBrokerInstallationTest() {

msalautomationapp/src/main/AndroidManifest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<category android:name="android.intent.category.BROWSABLE" />
3636
<data
3737
android:scheme="msauth"
38-
android:host="com.msft.identity.client.sample.local"
38+
android:host="com.msft.identity.client.msal.automationapp.local"
3939
android:path="/1wIqXSqBj7w+h11ZifsnqwgyKrY="/>
4040
</intent-filter>
4141
</activity>
@@ -48,6 +48,9 @@
4848
<package android:name="com.microsoft.office.word" />
4949
<package android:name="com.microsoft.teams" />
5050
<package android:name="com.azuresamples.msalandroidapp" />
51+
<package android:name="com.msft.oneauth.testapp" />
52+
<package android:name="com.microsoft.identity.client.testapp" />
53+
<package android:name="com.msft.identity.client.sample.local" />
5154
</queries>
5255

5356
</manifest>

msalautomationapp/src/main/res/raw/msal_automation_config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
33
"authorization_user_agent" : "DEFAULT",
4-
"redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
5-
"multiple_clouds_supported":true,
4+
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true,
65
"account_mode": "MULTIPLE",
76
"authorities" : [
87
{

0 commit comments

Comments
 (0)