Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a6bd1e4 authored by ykhung's avatar ykhung Committed by YUKAI HUNG
Browse files

Set default locale in the testing environment to avoid flaky test 

from the error message, looks like some testing environment cannot get the default locale settings to cause it crash. we will et the default locale before testing to avoid such condition.

Bug: 188947451
Test: make SettingsgRoboTests
Change-Id: I6ec9abba41d72c205426df8710eae5b83a841f46
parent bc55541e

tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -93,8 +93,9 @@ public final class BatteryChartPreferenceControllerTest { 


    @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);

tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ public final class ConvertUtilsTest { 
        mContext = spy(RuntimeEnvironment.application);

        mFeatureFactory = FakeFeatureFactory.setupForTest();

        mPowerUsageFeatureProvider = mFeatureFactory.powerUsageFeatureProvider;

        Locale.setDefault(new Locale("en_US"));

        org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false);

    }



    @Test