Skip to content

adjust ltw tests, Fixes AB#3382033 #2385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 7, 2025
Merged

adjust ltw tests, Fixes AB#3382033 #2385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
610f4fb
adjust ltw tests
fadidurah Sep 30, 2025
4038dcd
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…
fadidurah Oct 1, 2025
c79d82c
delete old tests
fadidurah Oct 1, 2025
8ece527
common
fadidurah Oct 1, 2025
8b72950
gradle
fadidurah Oct 7, 2025
44c80a6
revert delete
fadidurah Oct 7, 2025
fc9c7f2
adjust tests
fadidurah Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 37 files
+3 −0 changelog.txt
+91 −27 common/src/androidTest/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyProviderTest.java
+426 −0 .../androidTest/java/com/microsoft/identity/common/crypto/KeyStoreBackedSecretKeyProviderInstrumentedTest.java
+385 −0 ...n/src/androidTest/java/com/microsoft/identity/common/crypto/KeyStoreBackedSecretKeyProviderRolloutTest.java
+10 −5 common/src/androidTest/java/com/microsoft/identity/common/internal/util/AndroidKeyStoreUtilTest.java
+14 −4 common/src/main/java/com/microsoft/identity/common/adal/internal/AuthenticationConstants.java
+1 −1 common/src/main/java/com/microsoft/identity/common/crypto/AndroidAuthSdkStorageEncryptionManager.java
+2 −2 common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyProvider.java
+88 −0 common/src/main/java/com/microsoft/identity/common/crypto/CipherSpec.kt
+201 −0 common/src/main/java/com/microsoft/identity/common/crypto/CryptoParameterSpecFactory.kt
+146 −0 common/src/main/java/com/microsoft/identity/common/crypto/KeyGenSpec.kt
+526 −0 common/src/main/java/com/microsoft/identity/common/crypto/KeyStoreBackedSecretKeyProvider.kt
+84 −0 common/src/main/java/com/microsoft/identity/common/crypto/KeyStoreBackedSecretKeyProviderFactory.kt
+191 −0 ...n/src/main/java/com/microsoft/identity/common/crypto/wrappedsecretkey/AbstractWrappedSecretKeySerializer.kt
+62 −0 common/src/main/java/com/microsoft/identity/common/crypto/wrappedsecretkey/IWrappedSecretKeySerializer.kt
+99 −0 common/src/main/java/com/microsoft/identity/common/crypto/wrappedsecretkey/WrappedSecretKey.kt
+96 −0 ...c/main/java/com/microsoft/identity/common/crypto/wrappedsecretkey/WrappedSecretKeyBinaryStreamSerializer.kt
+108 −0 common/src/main/java/com/microsoft/identity/common/crypto/wrappedsecretkey/WrappedSecretKeyLegacySerializer.kt
+48 −0 common/src/main/java/com/microsoft/identity/common/crypto/wrappedsecretkey/WrappedSecretKeyMetadata.kt
+102 −0 ...on/src/main/java/com/microsoft/identity/common/crypto/wrappedsecretkey/WrappedSecretKeySerializerManager.kt
+19 −19 common/src/main/java/com/microsoft/identity/common/internal/broker/AuthUxJavaScriptInterface.kt
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/SwitchBrowserActivity.kt
+0 −1 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/CustomTabsManager.java
+131 −57 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClient.java
+23 −1 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/OAuth2WebViewClient.java
+52 −8 common/src/main/java/com/microsoft/identity/common/internal/util/AndroidKeyStoreUtil.java
+3 −3 common/src/test/java/com/microsoft/identity/common/crypto/AndroidAuthSdkStorageEncryptionManagerTest.java
+215 −0 common/src/test/java/com/microsoft/identity/common/crypto/CryptoParameterSpecFactoryTest.kt
+421 −0 common/src/test/java/com/microsoft/identity/common/crypto/WrappedSecretKeyTest.kt
+256 −0 ...rc/test/java/com/microsoft/identity/common/crypto/wrappedsecretkey/WrappedSecretKeySerializerManagerTest.kt
+14 −8 common/src/test/java/com/microsoft/identity/common/internal/broker/AuthUxJavaScriptInterfaceTest.kt
+159 −0 .../src/test/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClientTest.java
+647 −0 common/src/test/java/com/microsoft/identity/common/internal/util/AndroidKeyStoreUtilTest.java
+5 −3 ...n4j/src/main/com/microsoft/identity/common/java/commands/parameters/BrokerSilentTokenCommandParameters.java
+15 −0 common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java
+35 −10 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+5 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
15 changes: 15 additions & 0 deletions msal/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ plugins {
id 'checkstyle'
id 'maven-publish'
id 'kotlin-android'

// Test retries
id 'org.gradle.test-retry' version '1.5.6'
}

apply from: 'versioning/version_tasks.gradle'
Expand All @@ -25,6 +28,18 @@ codeCoverageReport {
coverage.enabled = enableCodeCoverage
}

// https://blog.gradle.org/gradle-flaky-test-retry-plugin
tasks.withType(Test) {
retry {
// The maximum number of test failures that are allowed before retrying is disabled.
maxRetries = 2
// The maximum number of times to retry an individual test.
maxFailures = 10
// Controls whether tests that initially fail and then pass on retry should fail the task.
failOnPassedAfterRetry = false
}
}

android {
namespace "com.microsoft.identity.msal"
compileOptions {
Expand Down
165 changes: 0 additions & 165 deletions ...com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2571345.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2571361.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest;
import com.microsoft.identity.client.ui.automation.annotations.LTWTests;
import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure;
import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus;
import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers;
import com.microsoft.identity.client.ui.automation.app.MsalTestApp;
import com.microsoft.identity.client.ui.automation.app.OneAuthTestApp;
Expand All @@ -52,7 +51,6 @@
// If Company Portal is installed after LTW, user should still get SSO
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2571361
@LTWTests
@RunOnAPI29Minus
@RetryOnFailure
@SupportedBrokers(brokers = {BrokerLTW.class})
@RunWith(Parameterized.class)
Expand Down
173 changes: 0 additions & 173 deletions ...com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2571508.java
View file
Open in desktop

This file was deleted.

Loading