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

Update homepage summaries

Browse Source 
- Network & internet
- Connected devices
- Display
- Wallpaper & style
- Accessibility
- Tips & support
- Also clear the redundant codes and tests.

Fixes: 183642373
Fixes: 189981034
Fixes: 190011428
Fixes: 190015037
Test: robotests & visual
Change-Id: Ide19fa5aff67e093d86b259c5e7a307b9ad37550
This commit is contained in:
Yanting Yang
2021-06-06 11:48:55 +08:00
parent 09666f9ef4
commit 3e2313e958
6 changed files with 26 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
View File

@@ -23,16 +23,12 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@RunWith(RobolectricTestRunner.class)
public class TopLevelConnectedDevicesPreferenceControllerTest {
@@ -56,20 +52,4 @@ public class TopLevelConnectedDevicesPreferenceControllerTest {
public void getAvailabilityStatus_unsupportedWhenSet() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@Config(shadows = ShadowAdvancedConnectedDeviceController.class)
public void getSummary_shouldCallAdvancedConnectedDeviceController() {
assertThat(mController.getSummary())
.isEqualTo(mContext.getText(R.string.settings_label_launcher));
}
@Implements(AdvancedConnectedDeviceController.class)
private static class ShadowAdvancedConnectedDeviceController {
@Implementation
protected static int getConnectedDevicesSummaryResourceId(Context context) {
return R.string.settings_label_launcher;
}
}
}

28
tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
View File

@@ -24,10 +24,11 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserManager;
import android.text.BidiFormatter;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
import org.junit.After;
import org.junit.Before;
@@ -47,11 +48,7 @@ import org.robolectric.util.ReflectionHelpers;
public class TopLevelNetworkEntryPreferenceControllerTest {
@Mock
private WifiPrimarySwitchPreferenceController mWifiPreferenceController;
@Mock
private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
@Mock
private TetherPreferenceController mTetherPreferenceController;
private MobileNetworkPreferenceController mMobileNetworkPreferenceController;;
private Context mContext;
private TopLevelNetworkEntryPreferenceController mController;
@@ -66,12 +63,8 @@ public class TopLevelNetworkEntryPreferenceControllerTest {
mController = new TopLevelNetworkEntryPreferenceController(mContext, "test_key");
ReflectionHelpers.setField(mController, "mWifiPreferenceController",
mWifiPreferenceController);
ReflectionHelpers.setField(mController, "mMobileNetworkPreferenceController",
mMobileNetworkPreferenceController);
ReflectionHelpers.setField(mController, "mTetherPreferenceController",
mTetherPreferenceController);
}
@After
@@ -86,21 +79,18 @@ public class TopLevelNetworkEntryPreferenceControllerTest {
}
@Test
public void getSummary_hasMobileAndHotspot_shouldReturnMobileSummary() {
when(mWifiPreferenceController.isAvailable()).thenReturn(true);
public void getSummary_hasMobile_shouldReturnMobileSummary() {
when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(true);
when(mTetherPreferenceController.isAvailable()).thenReturn(true);
assertThat(mController.getSummary())
.isEqualTo("Wi\u2011Fi, mobile, data usage, hotspot");
assertThat(mController.getSummary()).isEqualTo(BidiFormatter.getInstance().unicodeWrap(
mContext.getString(R.string.network_dashboard_summary_mobile)));
}
@Test
public void getSummary_noMobileOrHotspot_shouldReturnSimpleSummary() {
when(mWifiPreferenceController.isAvailable()).thenReturn(true);
public void getSummary_noMobile_shouldReturnNoMobileSummary() {
when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(false);
when(mTetherPreferenceController.isAvailable()).thenReturn(false);
assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi, data usage");
assertThat(mController.getSummary()).isEqualTo(BidiFormatter.getInstance().unicodeWrap(
mContext.getString(R.string.network_dashboard_summary_no_mobile)));
}
}