PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix test error of SatelliteSettingsPreferenceControllerTest" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-17 05:51:07 -08:00
committed by Android (Google) Code Review
parent 6946f8238a 543e446150
commit be9c39f0aa
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -286,7 +286,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
final SatelliteSettingPreferenceController satelliteSettingPreferenceController = use( final SatelliteSettingPreferenceController satelliteSettingPreferenceController = use(
SatelliteSettingPreferenceController.class); SatelliteSettingPreferenceController.class);
if (satelliteSettingPreferenceController != null) { if (satelliteSettingPreferenceController != null) {
satelliteSettingPreferenceController.init(mSubId); satelliteSettingPreferenceController.initialize(mSubId);
} }
use(ApnPreferenceController.class).init(mSubId); use(ApnPreferenceController.class).init(mSubId);

2
src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
View File

@@ -160,7 +160,7 @@ public class SatelliteSettingPreferenceController extends
* *
* @param subId subscription ID. * @param subId subscription ID.
*/ */
public void init(int subId) { public void initialize(int subId) {
logd("init(), subId=" + subId); logd("init(), subId=" + subId);
mSubId = subId; mSubId = subId;
mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId); mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);

27
tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java
View File

@@ -48,7 +48,6 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.internal.telephony.flags.Flags; import com.android.internal.telephony.flags.Flags;
import com.android.settings.R;
import com.android.settings.network.CarrierConfigCache; import com.android.settings.network.CarrierConfigCache;
import org.junit.Before; import org.junit.Before;
@@ -167,7 +166,7 @@ public class SatelliteSettingsPreferenceControllerTest {
@Test @Test
@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
public void onResume_registerTelephonyCallback_success() { public void onResume_registerTelephonyCallback_success() {
mController.init(TEST_SUB_ID); mController.initialize(TEST_SUB_ID);
mController.onResume(null); mController.onResume(null);
verify(mTelephonyManager).registerTelephonyCallback(any(), any()); verify(mTelephonyManager).registerTelephonyCallback(any(), any());
@@ -176,7 +175,7 @@ public class SatelliteSettingsPreferenceControllerTest {
@Test @Test
@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
public void getAvailabilityStatus_unregisterTelephonyCallback_success() { public void getAvailabilityStatus_unregisterTelephonyCallback_success() {
mController.init(TEST_SUB_ID); mController.initialize(TEST_SUB_ID);
mController.onPause(null); mController.onPause(null);
verify(mTelephonyManager).unregisterTelephonyCallback(any()); verify(mTelephonyManager).unregisterTelephonyCallback(any());
@@ -185,7 +184,7 @@ public class SatelliteSettingsPreferenceControllerTest {
@Test @Test
@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
public void getAvailabilityStatus_hasServiceDataType_showDataUi() { public void getAvailabilityStatus_hasServiceDataType_showDataUi() {
mController.init(TEST_SUB_ID); mController.initialize(TEST_SUB_ID);
Preference preference = new Preference(mContext); Preference preference = new Preference(mContext);
preference.setKey(KEY); preference.setKey(KEY);
preference.setTitle("test title"); preference.setTitle("test title");
@@ -194,14 +193,13 @@ public class SatelliteSettingsPreferenceControllerTest {
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged( mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
new int[]{SERVICE_TYPE_SMS, SERVICE_TYPE_DATA}); new int[]{SERVICE_TYPE_SMS, SERVICE_TYPE_DATA});
assertThat(preference.getTitle()).isEqualTo( assertThat(preference.getTitle()).isEqualTo("Satellite connectivity");
mContext.getString(R.string.title_satellite_setting_connectivity));
} }
@Test @Test
@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)
public void getAvailabilityStatus_onlyHasServiceSmsType_showSmsUi() { public void getAvailabilityStatus_onlyHasServiceSmsType_showSmsUi() {
mController.init(TEST_SUB_ID); mController.initialize(TEST_SUB_ID);
Preference preference = new Preference(mContext); Preference preference = new Preference(mContext);
preference.setKey(KEY); preference.setKey(KEY);
preference.setTitle("test title"); preference.setTitle("test title");
@@ -210,8 +208,7 @@ public class SatelliteSettingsPreferenceControllerTest {
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged( mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
new int[]{SERVICE_TYPE_SMS}); new int[]{SERVICE_TYPE_SMS});
assertThat(preference.getTitle()).isEqualTo( assertThat(preference.getTitle()).isEqualTo("Satellite messaging");
mContext.getString(R.string.satellite_setting_title));
} }
@Test @Test
@@ -220,14 +217,14 @@ public class SatelliteSettingsPreferenceControllerTest {
mCarrierConfig.putBoolean( mCarrierConfig.putBoolean(
KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
false); false);
mController.init(TEST_SUB_ID); mController.initialize(TEST_SUB_ID);
Preference preference = new Preference(mContext); Preference preference = new Preference(mContext);
preference.setKey(KEY); preference.setKey(KEY);
preference.setTitle("test title"); preference.setTitle("test title");
mController.updateState(preference); mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo( assertThat(preference.getSummary()).isEqualTo(
mContext.getString(R.string.satellite_setting_summary_without_entitlement)); "Send and receive text messages by satellite. Contact your carrier for details.");
} }
@Test @Test
@@ -239,7 +236,7 @@ public class SatelliteSettingsPreferenceControllerTest {
mCarrierConfig.putInt( mCarrierConfig.putInt(
CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT, CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
CARRIER_ROAMING_NTN_CONNECT_MANUAL); CARRIER_ROAMING_NTN_CONNECT_MANUAL);
mController.init(TEST_SUB_ID); mController.initialize(TEST_SUB_ID);
PreferenceManager preferenceManager = new PreferenceManager(mContext); PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext); PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
Preference preference = new Preference(mContext); Preference preference = new Preference(mContext);
@@ -250,7 +247,7 @@ public class SatelliteSettingsPreferenceControllerTest {
mController.displayPreference(preferenceScreen); mController.displayPreference(preferenceScreen);
assertThat(preference.getSummary()).isEqualTo( assertThat(preference.getSummary()).isEqualTo(
mContext.getString(R.string.satellite_setting_enabled_summary)); "Send and receive text messages by satellite. Included with your account.");
} }
@Test @Test
@@ -262,7 +259,7 @@ public class SatelliteSettingsPreferenceControllerTest {
mCarrierConfig.putInt( mCarrierConfig.putInt(
CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT, CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
CARRIER_ROAMING_NTN_CONNECT_MANUAL); CARRIER_ROAMING_NTN_CONNECT_MANUAL);
mController.init(TEST_SUB_ID); mController.initialize(TEST_SUB_ID);
PreferenceManager preferenceManager = new PreferenceManager(mContext); PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext); PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
Preference preference = new Preference(mContext); Preference preference = new Preference(mContext);
@@ -273,6 +270,6 @@ public class SatelliteSettingsPreferenceControllerTest {
mController.displayPreference(preferenceScreen); mController.displayPreference(preferenceScreen);
assertThat(preference.getSummary()).isEqualTo( assertThat(preference.getSummary()).isEqualTo(
mContext.getString(R.string.satellite_setting_disabled_summary)); "Send and receive text messages by satellite. Not included with your account.");
} }
} }