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

String change to highlight calculation stopped at last even hour

Browse Source 
Bug: 278022447
Fix: 278022447
Test: manual
Change-Id: Ia04ae7c7cb4c7ebdd40f4aa3df05b34d2ce66628
Merged-In: Ia08dea791bb72113719fd1316e8e9587a96eaef1
This commit is contained in:
Zaiyue Xue
2023-04-14 14:22:57 +08:00
parent c7550f62e7
commit 205d8249a7
3 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
View File

@@ -571,12 +571,13 @@ public final class BatteryChartPreferenceControllerTest {
}
@Test
public void refreshCategoryTitle_setLastFullChargeIntoBothTitleTextView() {
public void refreshCategoryTitle_singleDayData_setLastFullChargeIntoBothTitleTextView() {
mBatteryChartPreferenceController = createController();
mBatteryChartPreferenceController.mAppListPrefGroup =
spy(new PreferenceCategory(mContext));
mBatteryChartPreferenceController.mExpandDividerPreference =
spy(new ExpandDividerPreference(mContext));
mBatteryChartPreferenceController.setBatteryHistoryMap(createBatteryHistoryMap(6));
// Simulates select all condition.
mBatteryChartPreferenceController.mDailyChartIndex =
BatteryChartViewModel.SELECTED_INDEX_ALL;
@@ -590,13 +591,43 @@ public final class BatteryChartPreferenceControllerTest {
verify(mBatteryChartPreferenceController.mAppListPrefGroup)
.setTitle(captor.capture());
assertThat(captor.getValue())
.isEqualTo("App usage since last full charge");
.isEqualTo("App usage since last full charge to 12 PM");
// Verifies the title in the expandable divider.
captor = ArgumentCaptor.forClass(String.class);
verify(mBatteryChartPreferenceController.mExpandDividerPreference)
.setTitle(captor.capture());
assertThat(captor.getValue())
.isEqualTo("System usage since last full charge");
.isEqualTo("System usage since last full charge to 12 PM");
}
@Test
public void refreshCategoryTitle_multiDaysData_setLastFullChargeIntoBothTitleTextView() {
mBatteryChartPreferenceController = createController();
mBatteryChartPreferenceController.mAppListPrefGroup =
spy(new PreferenceCategory(mContext));
mBatteryChartPreferenceController.mExpandDividerPreference =
spy(new ExpandDividerPreference(mContext));
mBatteryChartPreferenceController.setBatteryHistoryMap(createBatteryHistoryMap(60));
// Simulates select all condition.
mBatteryChartPreferenceController.mDailyChartIndex =
BatteryChartViewModel.SELECTED_INDEX_ALL;
mBatteryChartPreferenceController.mHourlyChartIndex =
BatteryChartViewModel.SELECTED_INDEX_ALL;
mBatteryChartPreferenceController.refreshCategoryTitle();
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
// Verifies the title in the preference group.
verify(mBatteryChartPreferenceController.mAppListPrefGroup)
.setTitle(captor.capture());
assertThat(captor.getValue())
.isEqualTo("App usage since last full charge to Monday 6 PM");
// Verifies the title in the expandable divider.
captor = ArgumentCaptor.forClass(String.class);
verify(mBatteryChartPreferenceController.mExpandDividerPreference)
.setTitle(captor.capture());
assertThat(captor.getValue())
.isEqualTo("System usage since last full charge to Monday 6 PM");
}
@Test