From 04d13ee378049b7b3deea0f38e24b979a3e3debd Mon Sep 17 00:00:00 2001 From: Lei Yu Date: Thu, 22 Mar 2018 15:01:20 -0700 Subject: [PATCH] Fix tests for time format in settings 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 --- .../datausage/DataUsageSummaryPreferenceTest.java | 8 ++++---- .../settings/fuelgauge/AdvancedPowerUsageDetailTest.java | 4 ++-- .../fuelgauge/BatteryAppListPreferenceControllerTest.java | 6 +++--- .../com/android/settings/fuelgauge/BatteryInfoTest.java | 8 ++++---- .../android/settings/fuelgauge/PowerUsageSummaryTest.java | 2 +- .../batterytip/BatteryTipDialogFragmentTest.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 072f558364c..eee961de569 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -133,7 +133,7 @@ public class DataUsageSummaryPreferenceTest { bindViewHolder(); assertThat(mCarrierInfo.getText().toString()) - .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + "d ago"); + .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " days ago"); } @Test @@ -148,7 +148,7 @@ public class DataUsageSummaryPreferenceTest { bindViewHolder(); assertThat(mCarrierInfo.getText().toString()) - .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + "h ago"); + .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " hr ago"); } @Test @@ -163,7 +163,7 @@ public class DataUsageSummaryPreferenceTest { bindViewHolder(); assertThat(mCarrierInfo.getText().toString()) - .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + "m ago"); + .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " min ago"); } @Test @@ -199,7 +199,7 @@ public class DataUsageSummaryPreferenceTest { bindViewHolder(); assertThat(mCarrierInfo.getText().toString()) - .isEqualTo("Updated 2m ago"); + .isEqualTo("Updated 2 min ago"); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 929f3c30ea2..b7bcb9501fb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -418,8 +418,8 @@ public class AdvancedPowerUsageDetailTest { mFragment.initPreference(); - assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0m"); - assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0m"); + assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0 min"); + assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0 min"); assertThat(mPowerUsagePreference.getSummary()).isEqualTo("16% of total app usage (150mAh)"); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index 8156428d136..afedd5b0323 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -141,7 +141,7 @@ public class BatteryAppListPreferenceControllerTest { mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper); - assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2m"); + assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2 min"); } @Test @@ -152,7 +152,7 @@ public class BatteryAppListPreferenceControllerTest { mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper); - assertThat(mPreference.getSummary().toString()).isEqualTo("2m"); + assertThat(mPreference.getSummary().toString()).isEqualTo("2 min"); } @Test @@ -163,7 +163,7 @@ public class BatteryAppListPreferenceControllerTest { mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper); - assertThat(mPreference.getSummary().toString()).isEqualTo("2m"); + assertThat(mPreference.getSummary().toString()).isEqualTo("2 min"); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index 654f7fc5a83..99967f78370 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -61,16 +61,16 @@ import java.util.concurrent.TimeUnit; public class BatteryInfoTest { 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 long REMAINING_TIME_NULL = -1; private static final long REMAINING_TIME = 2; 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 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 FIFTEEN_MIN_FORMATTED = "15m"; + private static final String FIFTEEN_MIN_FORMATTED = "15 min"; public static final Estimate DUMMY_ESTIMATE = new Estimate( 1000, /* estimateMillis */ false, /* isBasedOnUsage */ @@ -131,7 +131,7 @@ public class BatteryInfoTest { mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */); 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 diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index d021c5d857f..5179ca67f02 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -208,7 +208,7 @@ public class PowerUsageSummaryTest { mFragment.updateLastFullChargePreference(); assertThat(mLastFullChargePref.getTitle()).isEqualTo("Full charge lasts about"); - assertThat(mLastFullChargePref.getSubtitle().toString()).isEqualTo("2h"); + assertThat(mLastFullChargePref.getSubtitle().toString()).isEqualTo("2 hr"); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java index d32e0263d3c..6d7e8e7210d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java @@ -204,7 +204,7 @@ public class BatteryTipDialogFragmentTest { ShadowAlertDialog shadowDialog = shadowOf(dialog); 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."); }