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

Merge "Support some phone information in Settings slice"

Browse Source
This commit is contained in:
Fan Zhang
2018-10-01 16:46:19 +00:00
committed by Android (Google) Code Review
parent f9f6200b28 4f40a8e287
commit 3600c03392
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
View File

@@ -48,7 +48,7 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
public class DeviceModelPreferenceControllerTest {
private final String KEY = "device_model_key";
private final String KEY = "device_model";
@Mock
private Fragment mFragment;
@@ -101,6 +101,11 @@ public class DeviceModelPreferenceControllerTest {
.add(any(HardwareInfoDialogFragment.class), eq(HardwareInfoDialogFragment.TAG));
}
@Test
public void isSliceable_shouldBeTrue() {
assertThat(mController.isSliceable()).isTrue();
}
private boolean containBuildModel(CharSequence result) {
final String oracle = mContext.getResources().getString(R.string.model_summary,
Build.MODEL);

7
tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
View File

@@ -44,7 +44,7 @@ import org.robolectric.annotation.Resetter;
@RunWith(SettingsRobolectricTestRunner.class)
public class FirmwareVersionPreferenceControllerTest {
private final String KEY = "firmware_key";
private final String KEY = "firmware_version";
@Mock
private Fragment mFragment;
@@ -103,6 +103,11 @@ public class FirmwareVersionPreferenceControllerTest {
assertThat(result).isFalse();
}
@Test
public void isSliceable_shouldBeTrue() {
assertThat(mController.isSliceable()).isTrue();
}
@Implements(FirmwareVersionDialogFragment.class)
public static class ShadowFirmwareVersionDialogFragment {