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

Commit 4f3e5c3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c183880 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517



Change-Id: Id83eadb6177a8424a0a28d87633971f7fd58e858
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c49f8710 0c183880

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -332,7 +332,7 @@ public final class BatteryChartPreferenceControllerTest { 
        mBatteryChartPreferenceController.mHourlyChartIndex = 2;

        mBatteryChartPreferenceController.mHourlyChartIndex = 2;





        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

                "10 AM - 12 PM");

                "10 AM - 12 PM");

    }

    }





    @Test

    @Test
@@ -342,7 +342,7 @@ public final class BatteryChartPreferenceControllerTest { 
        mBatteryChartPreferenceController.mHourlyChartIndex = 8;

        mBatteryChartPreferenceController.mHourlyChartIndex = 8;





        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

                "Sunday 4 PM - 6 PM");

                "Sunday 4 PM - 6 PM");

    }

    }





    @Test

    @Test
@@ -352,7 +352,7 @@ public final class BatteryChartPreferenceControllerTest { 
        mBatteryChartPreferenceController.mHourlyChartIndex = 0;

        mBatteryChartPreferenceController.mHourlyChartIndex = 0;





        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

                "7:01 AM - 8 AM");

                "7:01 AM - 8 AM");

    }

    }





    @Test

    @Test
@@ -362,7 +362,7 @@ public final class BatteryChartPreferenceControllerTest { 
        mBatteryChartPreferenceController.mHourlyChartIndex = 3;

        mBatteryChartPreferenceController.mHourlyChartIndex = 3;





        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

                "12 PM - now");

                "12 PM - now");

    }

    }





    @Test

    @Test
@@ -372,7 +372,7 @@ public final class BatteryChartPreferenceControllerTest { 
        mBatteryChartPreferenceController.mHourlyChartIndex = 0;

        mBatteryChartPreferenceController.mHourlyChartIndex = 0;





        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

        assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(

                "7:01 AM - now");

                "7:01 AM - now");

    }

    }





    @Test

    @Test