| commit | 3940e5293c52130cbb298a74700b7b02f0d55d83 | [log] [tgz] |
|---|---|---|
| author | YUKAI HUNG <ykhung@google.com> | Tue Jun 01 08:26:24 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 01 08:26:24 2021 +0000 |
| tree | fae76abfefa90aad176b8df5e9ce96007eecb5e0 | |
| parent | 25f79e300437b3727803b3c30c733ef1889f6e45 [diff] | |
| parent | 7a6bd1e4a4d78ea97bf78d219d71a5f576532a63 [diff] |
Merge "Set default locale in the testing environment to avoid flaky test" into sc-dev
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java index 606dc19..154673d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
@@ -93,8 +93,9 @@ @Before public void setUp() { - org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false); MockitoAnnotations.initMocks(this); + Locale.setDefault(new Locale("en_US")); + org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false); mFeatureFactory = FakeFeatureFactory.setupForTest(); mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider; mContext = spy(RuntimeEnvironment.application);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java index 0c96b8e..a6a9f19 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
@@ -60,6 +60,8 @@ mContext = spy(RuntimeEnvironment.application); mFeatureFactory = FakeFeatureFactory.setupForTest(); mPowerUsageFeatureProvider = mFeatureFactory.powerUsageFeatureProvider; + Locale.setDefault(new Locale("en_US")); + org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false); } @Test