Update test app , Fixes AB#3435630 (#2409)

[AB#3435630](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3435630)

[Related Common
Change](AzureAD/microsoft-authentication-library-common-for-android#2818)

Author: rpdome

common

@@ -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
@@ -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

msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowLegacyBrokerDiscoveryClient.kt

@@ -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;
@@ -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) {

msal/src/test/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactoryTest.kt

@@ -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"
@@ -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

testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java

@@ -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>