Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update feature flag QS_SECONDARY_DATA_SUB_INFO in test" into tm-qpr-dev am: cfd69cce78

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20483531

Change-Id: I0efbd8cbb4410b6b58f4cb48c45d5497ec102654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-15 22:30:10 +00:00
committed by Automerger Merge Worker
parent 05f32f6c94 cfd69cce78
commit c066b2feb9
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java
View File

@@ -58,8 +58,8 @@ import com.android.systemui.R;
import com.android.systemui.SysuiTestCase; import com.android.systemui.SysuiTestCase;
import com.android.systemui.animation.DialogLaunchAnimator; import com.android.systemui.animation.DialogLaunchAnimator;
import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.FakeFeatureFlags;
import com.android.systemui.flags.UnreleasedFlag; import com.android.systemui.flags.Flags;
import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.statusbar.connectivity.AccessPointController; import com.android.systemui.statusbar.connectivity.AccessPointController;
import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -161,8 +161,8 @@ public class InternetDialogControllerTest extends SysuiTestCase {
private WifiStateWorker mWifiStateWorker; private WifiStateWorker mWifiStateWorker;
@Mock @Mock
private SignalStrength mSignalStrength; private SignalStrength mSignalStrength;
@Mock
private FeatureFlags mFlags; private FakeFeatureFlags mFlags = new FakeFeatureFlags();
private TestableResources mTestableResources; private TestableResources mTestableResources;
private InternetDialogController mInternetDialogController; private InternetDialogController mInternetDialogController;
@@ -213,6 +213,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
mInternetDialogController.onAccessPointsChanged(mAccessPoints); mInternetDialogController.onAccessPointsChanged(mAccessPoints);
mInternetDialogController.mActivityStarter = mActivityStarter; mInternetDialogController.mActivityStarter = mActivityStarter;
mInternetDialogController.mWifiIconInjector = mWifiIconInjector; mInternetDialogController.mWifiIconInjector = mWifiIconInjector;
mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, false);
} }
@After @After
@@ -348,7 +349,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
@Test @Test
public void getSubtitleText_withNoService_returnNoNetworksAvailable() { public void getSubtitleText_withNoService_returnNoNetworksAvailable() {
when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true); mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
InternetDialogController spyController = spy(mInternetDialogController); InternetDialogController spyController = spy(mInternetDialogController);
fakeAirplaneModeEnabled(false); fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
@@ -705,7 +706,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
@Test @Test
public void getSignalStrengthIcon_differentSubId() { public void getSignalStrengthIcon_differentSubId() {
when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true); mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
InternetDialogController spyController = spy(mInternetDialogController); InternetDialogController spyController = spy(mInternetDialogController);
Drawable icons = spyController.getSignalStrengthIcon(SUB_ID, mContext, 1, 1, 0, false); Drawable icons = spyController.getSignalStrengthIcon(SUB_ID, mContext, 1, 1, 0, false);
Drawable icons2 = spyController.getSignalStrengthIcon(SUB_ID2, mContext, 1, 1, 0, false); Drawable icons2 = spyController.getSignalStrengthIcon(SUB_ID2, mContext, 1, 1, 0, false);
@@ -715,7 +716,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
@Test @Test
public void getActiveAutoSwitchNonDdsSubId() { public void getActiveAutoSwitchNonDdsSubId() {
when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true); mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
// active on non-DDS // active on non-DDS
SubscriptionInfo info = mock(SubscriptionInfo.class); SubscriptionInfo info = mock(SubscriptionInfo.class);
doReturn(SUB_ID2).when(info).getSubscriptionId(); doReturn(SUB_ID2).when(info).getSubscriptionId();
@@ -751,7 +752,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
@Test @Test
public void getMobileNetworkSummary() { public void getMobileNetworkSummary() {
when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true); mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
InternetDialogController spyController = spy(mInternetDialogController); InternetDialogController spyController = spy(mInternetDialogController);
doReturn(SUB_ID2).when(spyController).getActiveAutoSwitchNonDdsSubId(); doReturn(SUB_ID2).when(spyController).getActiveAutoSwitchNonDdsSubId();
doReturn(true).when(spyController).isMobileDataEnabled(); doReturn(true).when(spyController).isMobileDataEnabled();
@@ -775,7 +776,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
@Test @Test
public void launchMobileNetworkSettings_validSubId() { public void launchMobileNetworkSettings_validSubId() {
when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true); mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
InternetDialogController spyController = spy(mInternetDialogController); InternetDialogController spyController = spy(mInternetDialogController);
doReturn(SUB_ID2).when(spyController).getActiveAutoSwitchNonDdsSubId(); doReturn(SUB_ID2).when(spyController).getActiveAutoSwitchNonDdsSubId();
spyController.launchMobileNetworkSettings(mDialogLaunchView); spyController.launchMobileNetworkSettings(mDialogLaunchView);
@@ -786,7 +787,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
@Test @Test
public void launchMobileNetworkSettings_invalidSubId() { public void launchMobileNetworkSettings_invalidSubId() {
when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true); mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
InternetDialogController spyController = spy(mInternetDialogController); InternetDialogController spyController = spy(mInternetDialogController);
doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID) doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
.when(spyController).getActiveAutoSwitchNonDdsSubId(); .when(spyController).getActiveAutoSwitchNonDdsSubId();
@@ -798,7 +799,7 @@ public class InternetDialogControllerTest extends SysuiTestCase {
@Test @Test
public void setAutoDataSwitchMobileDataPolicy() { public void setAutoDataSwitchMobileDataPolicy() {
when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true); mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
mInternetDialogController.setAutoDataSwitchMobileDataPolicy(SUB_ID, true); mInternetDialogController.setAutoDataSwitchMobileDataPolicy(SUB_ID, true);
verify(mTelephonyManager).setMobileDataPolicyEnabled(eq( verify(mTelephonyManager).setMobileDataPolicyEnabled(eq(