diff --git a/common b/common index 2758acc6e3..e8a10e35bc 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2758acc6e35a23cad14a6547b9664cb8e7e36ee9 +Subproject commit e8a10e35bcb7863b0b0d1bf237d2932b20937259 diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowLegacyBrokerDiscoveryClient.kt b/msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowLegacyBrokerDiscoveryClient.kt deleted file mode 100644 index 7e9119e73a..0000000000 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowLegacyBrokerDiscoveryClient.kt +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// All rights reserved. -// -// This code is licensed under the MIT License. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -package com.microsoft.identity.client.e2e.shadows - -import com.microsoft.identity.common.internal.activebrokerdiscovery.LegacyBrokerDiscoveryClient -import com.microsoft.identity.common.internal.broker.BrokerData -import org.robolectric.annotation.Implements - -// A Shadow for mocking LegacyBrokerDiscoveryClient -@Implements(LegacyBrokerDiscoveryClient::class) -class ShadowLegacyBrokerDiscoveryClient { - - fun getActiveBroker(shouldSkipCache: Boolean): BrokerData? { - return BrokerData.debugBrokerHost - } -} \ No newline at end of file diff --git a/msal/src/test/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactoryTest.kt b/msal/src/test/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactoryTest.kt index dc06ea8661..410fc0fa90 100644 --- a/msal/src/test/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactoryTest.kt +++ b/msal/src/test/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactoryTest.kt @@ -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 diff --git a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java index dd761f2127..ae59c8dcf3 100644 --- a/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java +++ b/testapps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java @@ -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) { diff --git a/testapps/testapp/src/main/res/layout/fragment_acquire.xml b/testapps/testapp/src/main/res/layout/fragment_acquire.xml index 1a30403bfd..da8b777268 100644 --- a/testapps/testapp/src/main/res/layout/fragment_acquire.xml +++ b/testapps/testapp/src/main/res/layout/fragment_acquire.xml @@ -435,33 +435,6 @@ android:layout_weight="1"/> - - - - - - -