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

[Provider mode] Carrier item display network type on slice.

Browse Source 
Bug: 176871752
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: I79b4c3d45a52f0be0c058044f1d79a7056386193
This commit is contained in:
SongFerngWang
2021-01-19 08:00:38 +08:00
parent f3b25cc7cb
commit c14eefb125
5 changed files with 79 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
View File

@@ -164,18 +164,49 @@ public class ProviderModelSliceHelperTest {
}
@Test
public void createCarrierRow_hasDefaultDataSubscriptionId_verifyTitle() {
public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() {
String expectDisplayName = "Name1";
String expectedSubtitle = "5G";
String networkType = "5G";
int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
mDefaultDataSubscriptionInfo);
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
when(mTelephonyManager.isDataEnabled()).thenReturn(true);
ListBuilder.RowBuilder testRowBuild = mProviderModelSliceHelper.createCarrierRow();
ListBuilder.RowBuilder testRowBuild = mProviderModelSliceHelper.createCarrierRow(
networkType);
assertThat(testRowBuild.getTitle()).isEqualTo(expectDisplayName);
assertThat(testRowBuild.getSubtitle()).isEqualTo(expectedSubtitle);
}
@Test
public void createCarrierRow_hasDdsAndActiveNetworkIsCellular_verifyTitleAndSummary() {
String expectDisplayName = "Name1";
String networkType = "5G";
String connectedText = ResourcesUtils.getResourcesString(mContext,
"mobile_data_connection_active");
String expectedSubtitle = ResourcesUtils.getResourcesString(mContext,
"preference_summary_default_combination", connectedText, networkType);
int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
mDefaultDataSubscriptionInfo);
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
ListBuilder.RowBuilder testRowBuild = mProviderModelSliceHelper.createCarrierRow(
networkType);
assertThat(testRowBuild.getTitle()).isEqualTo(expectDisplayName);
assertThat(testRowBuild.getSubtitle()).isEqualTo(expectedSubtitle);
}
@Test

3
tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
View File

@@ -302,7 +302,8 @@ public class ProviderModelSliceTest {
when(mMockCarrierRowBuild.getTitle()).thenReturn("mockRow");
when(mMockCarrierRowBuild.getPrimaryAction()).thenReturn(mockSliceAction);
when(mProviderModelSliceHelper.createCarrierRow()).thenReturn(mMockCarrierRowBuild);
when(mProviderModelSliceHelper.createCarrierRow(anyString())).thenReturn(
mMockCarrierRowBuild);
}
private SliceAction getPrimarySliceAction() {