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

Commit d46cf49b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix tests for time format in settings" into pi-dev

parents bbb3d3e7 04d13ee3

tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java

+4 −4
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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)");

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -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

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

+4 −4
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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