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

Fix tests for time format in settings

Browse Source 
Because now we use different time format across the settings app.
We need to update all the tests.

Bug: 76113036
Test: RunSettingsRoboTests
Change-Id: Id4f7d55775adfdeb1aa0ae234f35d515ced4f450
This commit is contained in:
Lei Yu
2018-03-22 15:01:20 -07:00
parent 4e25277f60
commit 04d13ee378
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -133,7 +133,7 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + "d ago"); .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " days ago");
} }
@Test @Test
@@ -148,7 +148,7 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + "h ago"); .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " hr ago");
} }
@Test @Test
@@ -163,7 +163,7 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + "m ago"); .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " min ago");
} }
@Test @Test
@@ -199,7 +199,7 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated 2m ago"); .isEqualTo("Updated 2 min ago");
} }
@Test @Test

4
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

@@ -418,8 +418,8 @@ public class AdvancedPowerUsageDetailTest {
mFragment.initPreference(); mFragment.initPreference();
assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0m"); assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0 min");
assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0m"); assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0 min");
assertThat(mPowerUsagePreference.getSummary()).isEqualTo("16% of total app usage (150mAh)"); assertThat(mPowerUsagePreference.getSummary()).isEqualTo("16% of total app usage (150mAh)");
} }

6
tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
View File

@@ -141,7 +141,7 @@ public class BatteryAppListPreferenceControllerTest {
mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper); mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2m"); assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2 min");
} }
@Test @Test
@@ -152,7 +152,7 @@ public class BatteryAppListPreferenceControllerTest {
mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper); mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
assertThat(mPreference.getSummary().toString()).isEqualTo("2m"); assertThat(mPreference.getSummary().toString()).isEqualTo("2 min");
} }
@Test @Test
@@ -163,7 +163,7 @@ public class BatteryAppListPreferenceControllerTest {
mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper); mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
assertThat(mPreference.getSummary().toString()).isEqualTo("2m"); assertThat(mPreference.getSummary().toString()).isEqualTo("2 min");
} }
@Test @Test

8
tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
View File

@@ -61,16 +61,16 @@ import java.util.concurrent.TimeUnit;
public class BatteryInfoTest { public class BatteryInfoTest {
private static final String STATUS_CHARGING_NO_TIME = "50% - charging"; private static final String STATUS_CHARGING_NO_TIME = "50% - charging";
private static final String STATUS_CHARGING_TIME = "50% - 0m until fully charged"; private static final String STATUS_CHARGING_TIME = "50% - 0 min until fully charged";
private static final String STATUS_NOT_CHARGING = "Not charging"; private static final String STATUS_NOT_CHARGING = "Not charging";
private static final long REMAINING_TIME_NULL = -1; private static final long REMAINING_TIME_NULL = -1;
private static final long REMAINING_TIME = 2; private static final long REMAINING_TIME = 2;
private static final String ENHANCED_STRING_SUFFIX = "based on your usage"; private static final String ENHANCED_STRING_SUFFIX = "based on your usage";
private static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1); private static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);
private static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED = private static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =
"1m left until fully charged"; "1 min left until fully charged";
private static final String TEST_BATTERY_LEVEL_10 = "10%"; private static final String TEST_BATTERY_LEVEL_10 = "10%";
private static final String FIFTEEN_MIN_FORMATTED = "15m"; private static final String FIFTEEN_MIN_FORMATTED = "15 min";
public static final Estimate DUMMY_ESTIMATE = new Estimate( public static final Estimate DUMMY_ESTIMATE = new Estimate(
1000, /* estimateMillis */ 1000, /* estimateMillis */
false, /* isBasedOnUsage */ false, /* isBasedOnUsage */
@@ -131,7 +131,7 @@ public class BatteryInfoTest {
mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */); mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
assertThat(info.discharging).isEqualTo(false); assertThat(info.discharging).isEqualTo(false);
assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1m until fully charged"); assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1 min until fully charged");
} }
@Test @Test

2
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -208,7 +208,7 @@ public class PowerUsageSummaryTest {
mFragment.updateLastFullChargePreference(); mFragment.updateLastFullChargePreference();
assertThat(mLastFullChargePref.getTitle()).isEqualTo("Full charge lasts about"); assertThat(mLastFullChargePref.getTitle()).isEqualTo("Full charge lasts about");
assertThat(mLastFullChargePref.getSubtitle().toString()).isEqualTo("2h"); assertThat(mLastFullChargePref.getSubtitle().toString()).isEqualTo("2 hr");
} }
@Test @Test

2
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
View File

@@ -204,7 +204,7 @@ public class BatteryTipDialogFragmentTest {
ShadowAlertDialog shadowDialog = shadowOf(dialog); ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo( assertThat(shadowDialog.getMessage()).isEqualTo(
"Based on your usage, your battery usually lasts about 1h when fully charged" "Based on your usage, your battery usually lasts about 1 hr when fully charged"
+ ".\n\nIf you need to extend your battery life, turn on Battery Saver."); + ".\n\nIf you need to extend your battery life, turn on Battery Saver.");
} }