Skip to content

Update test app , Fixes AB#3435630 #2409

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 2 commits into from
Nov 20, 2025
Merged

Update test app , Fixes AB#3435630 #2409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a993ba4
update test app
rpdome Nov 19, 2025
ac80d0d
remove tests
rpdome Nov 19, 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 9 files
+4 −1 changelog.txt
+1 −1 common/build.gradle
+5 −42 .../src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClientFactory.kt
+127 −3 common/src/test/java/com/microsoft/identity/common/BrokerOAuth2TokenCacheTest.java
+1,240 −0 common/src/test/java/com/microsoft/identity/common/BrokerOAuth2TokenCacheWithInMemoryCacheTest.java
+76 −69 common4j/src/main/com/microsoft/identity/common/java/cache/BrokerOAuth2TokenCache.java
+6 −1 common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java
+6 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+6 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
36 changes: 0 additions & 36 deletions .../test/java/com/microsoft/identity/client/e2e/shadows/ShadowLegacyBrokerDiscoveryClient.kt
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions ...test/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.test.core.app.ApplicationProvider
import com.microsoft.identity.client.PublicClientApplicationConfiguration
import com.microsoft.identity.client.PublicClientApplicationConfigurationFactory
import com.microsoft.identity.client.e2e.shadows.ShadowBrokerDiscoveryClient
import com.microsoft.identity.client.e2e.shadows.ShadowLegacyBrokerDiscoveryClient
import com.microsoft.identity.common.internal.controllers.BrokerMsalController
import com.microsoft.identity.common.java.authorities.Authority
import com.microsoft.identity.msal.test.R
Expand All @@ -39,9 +38,7 @@ import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@RunWith(RobolectricTestRunner::class)
@Config(shadows = [
ShadowLegacyBrokerDiscoveryClient::class,
ShadowBrokerDiscoveryClient::class] )
@Config(shadows = [ShadowBrokerDiscoveryClient::class] )
class MSALControllerFactoryTest {

private lateinit var pcaConfiguration: PublicClientApplicationConfiguration
Expand Down
11 changes: 0 additions & 11 deletions ...pps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ public class AcquireTokenFragment extends Fragment {
private Button mAddNgcMfaClaimButton;
private Switch mEnablePII;
private Switch mForceRefresh;
private Switch mEnableNewBrokerDiscovery;
private Switch mAllowSignInFromOtherDevice;

private Button mClearActiveBrokerDiscoveryCache;
Expand Down Expand Up @@ -203,19 +202,9 @@ public void onClick(View v) {
AndroidPlatformComponentsFactory.createFromContext(getContext()).getStorageSupplier()
);

mEnableNewBrokerDiscovery = view.findViewById(R.id.enableBrokerDiscovery);
mCachedActiveBrokerName = view.findViewById(R.id.cachedActiveBrokerName);
mClearActiveBrokerDiscoveryCache = view.findViewById(R.id.clearActiveBrokerDiscoveryCache);

mEnableNewBrokerDiscovery.setChecked(BrokerDiscoveryClientFactory.isNewBrokerDiscoveryEnabled());
mEnableNewBrokerDiscovery.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton v, boolean value) {
BrokerDiscoveryClientFactory.setNewBrokerDiscoveryEnabled(value);
setActiveBrokerTextFromCache();
}
});

mClearActiveBrokerDiscoveryCache.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down
38 changes: 9 additions & 29 deletions testapps/testapp/src/main/res/layout/fragment_acquire.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,33 +435,6 @@
android:layout_weight="1"/>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:weightSum="16">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="6"
android:text="@string/enable_new_broker_discovery" />

<Switch
android:id="@+id/enableBrokerDiscovery"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center_vertical" />

<Button
android:id="@+id/clearActiveBrokerDiscoveryCache"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="8"
android:text="@string/clear_active_broker_cache" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -472,17 +445,24 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="3"
android:text="@string/current_cached_active_broker" />

<TextView
android:id="@+id/cachedActiveBrokerName"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
android:layout_weight="8"
android:layout_marginLeft="10dp"
android:text="@string/none"/>

<Button
android:id="@+id/clearActiveBrokerDiscoveryCache"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:text="@string/clear_active_broker_cache" />

</LinearLayout>

<LinearLayout
Expand Down
2 changes: 1 addition & 1 deletion testapps/testapp/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<string name="pop_client_claims">PoP client claims</string>
<string name="trust_debug_broker">DebugBroker?</string>
<string name="enable_new_broker_discovery">Enable New Broker Discovery</string>
<string name="clear_active_broker_cache">Clear Active Broker Cache</string>
<string name="clear_active_broker_cache">Clear</string>
<string name="current_cached_active_broker">Cached Active Broker</string>
<string name="none">None</string>

Expand Down
Loading