Skip to content

Reset flights between tests, Fixes AB#3413737 #2794

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
somalaya merged 5 commits into from
Oct 28, 2025
Merged

Reset flights between tests, Fixes AB#3413737 #2794

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9d25c8
reset flights between tests
somalaya Oct 27, 2025
4355735
reset flights after every test in cleanup
somalaya Oct 27, 2025
7738ffa
Merge branch 'dev' into somalay/fixFailingNonceTest
somalaya Oct 27, 2025
fbaa23b
Merge branch 'dev' into somalay/fixFailingNonceTest
somalaya Oct 28, 2025
6b3d427
Merge branch 'dev' into somalay/fixFailingNonceTest
somalaya Oct 28, 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
11 changes: 11 additions & 0 deletions .../microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import com.microsoft.identity.common.java.ui.webview.authorization.IAuthorizationCompletionCallback;
import com.microsoft.identity.common.shadows.ShadowProcessUtil;

import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -159,6 +160,11 @@ public void onPageLoaded(final String url) {
}
}

@After
public void cleanUp(){
CommonFlightsManager.INSTANCE.resetFlightsManager();
}

@Test(expected = IllegalArgumentException.class)
public void testUrlOverrideHandlesEmptyString() {
assertTrue(mWebViewClient.shouldOverrideUrlLoading(mMockWebView, ""));
Expand Down Expand Up @@ -489,6 +495,11 @@ public void testOnReceivedSslError_Legacy() {
final SslError mockError = Mockito.mock(android.net.http.SslError.class);
final IAuthorizationCompletionCallback mockCallback = Mockito.mock(IAuthorizationCompletionCallback.class);
when(mockError.getUrl()).thenReturn("https://example.com");
final IFlightsManager mockFlightsManager = Mockito.mock(IFlightsManager.class);
final IFlightsProvider mockFlightsProvider = Mockito.mock(IFlightsProvider.class);
when(mockFlightsProvider.isFlightEnabled(eq(CommonFlight.SHOULD_PRESERVE_WEBVIEW_FLOW_ON_SSL_ERROR))).thenReturn(false);
when(mockFlightsManager.getFlightsProvider(anyLong())).thenReturn(mockFlightsProvider);
CommonFlightsManager.INSTANCE.initializeCommonFlightsManager(mockFlightsManager);
final AzureActiveDirectoryWebViewClient mockWebViewClient = new AzureActiveDirectoryWebViewClient(
mActivity,
mockCallback,
Expand Down