Merge "Revert "Move the auto data switch preference into DDS sim""
This commit is contained in:
committed by
Android (Google) Code Review
commit
2eb121ce3f
@@ -28,18 +28,13 @@ import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.robolectric.Shadows.shadowOf;
|
||||
|
||||
import android.content.Context;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -61,15 +56,10 @@ public class AutoDataSwitchPreferenceControllerTest {
|
||||
private TelephonyManager mTelephonyManager;
|
||||
@Mock
|
||||
private PreferenceScreen mPreferenceScreen;
|
||||
@Mock
|
||||
private SubscriptionInfo mSubscriptionInfo1;
|
||||
@Mock
|
||||
private SubscriptionInfo mSubscriptionInfo2;
|
||||
|
||||
private Context mContext;
|
||||
private SwitchPreference mSwitchPreference;
|
||||
private AutoDataSwitchPreferenceController mController;
|
||||
private ShadowSubscriptionManager mShadowSubscriptionManager;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -79,11 +69,6 @@ public class AutoDataSwitchPreferenceControllerTest {
|
||||
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
|
||||
mSwitchPreference = new SwitchPreference(mContext);
|
||||
when(mPreferenceScreen.findPreference(PREF_KEY)).thenReturn(mSwitchPreference);
|
||||
when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
|
||||
when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
|
||||
mShadowSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class));
|
||||
mShadowSubscriptionManager.setActiveSubscriptionInfoList(ImmutableList.of(
|
||||
mSubscriptionInfo1, mSubscriptionInfo2));
|
||||
mController = new AutoDataSwitchPreferenceController(mContext, PREF_KEY) {
|
||||
@Override
|
||||
protected boolean hasMobileData() {
|
||||
@@ -105,19 +90,8 @@ public class AutoDataSwitchPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_defaultForData_available() {
|
||||
public void displayPreference_defaultForData_notAvailable() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
|
||||
mController.init(SUB_ID_1);
|
||||
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
assertThat(mSwitchPreference.isVisible()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_notDefaultForData_notAvailable() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_2);
|
||||
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
|
||||
@@ -126,25 +100,21 @@ public class AutoDataSwitchPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSubscriptionsChanged_becomesDefaultForData_available() {
|
||||
public void displayPreference_notDefaultForData_available() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_2);
|
||||
mController.init(SUB_ID_1);
|
||||
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
|
||||
mController.onSubscriptionsChanged();
|
||||
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
assertThat(mSwitchPreference.isVisible()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSubscriptionsChanged_noLongerDefaultForData_notAvailable() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
|
||||
mController.init(SUB_ID_1);
|
||||
public void onSubscriptionsChanged_becomesDefaultForData_notAvailable() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_2);
|
||||
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_2);
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
|
||||
mController.onSubscriptionsChanged();
|
||||
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
@@ -152,25 +122,34 @@ public class AutoDataSwitchPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_mobileDataChangWithDefaultDataSubId_returnAvailable() {
|
||||
public void onSubscriptionsChanged_noLongerDefaultForData_available() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
|
||||
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_2);
|
||||
mController.onSubscriptionsChanged();
|
||||
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
assertThat(mSwitchPreference.isVisible()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_mobileDataChangWithDefaultDataSubId_returnUnavailable() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
|
||||
mController.init(SUB_ID_1);
|
||||
|
||||
mController.refreshPreference();
|
||||
|
||||
assertThat(mController.getAvailabilityStatus(SUB_ID_1))
|
||||
.isEqualTo(AVAILABLE);
|
||||
.isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_mobileDataChangWithoutDefaultDataSubId_returnUnavailable() {
|
||||
public void getAvailabilityStatus_mobileDataChangWithoutDefaultDataSubId_returnAvailable() {
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
|
||||
mController.init(SUB_ID_1);
|
||||
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
mController.refreshPreference();
|
||||
|
||||
assertThat(mController.getAvailabilityStatus(SUB_ID_2)).isEqualTo(
|
||||
CONDITIONALLY_UNAVAILABLE);
|
||||
assertThat(mController.getAvailabilityStatus(SUB_ID_2)).isEqualTo(AVAILABLE);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user