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

Commit d971cb22 authored by YUKAI HUNG's avatar YUKAI HUNG Committed by Automerger Merge Worker
Browse files

Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd 

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

Change-Id: I687efe774f5bbd5334623bcc486ec864f571045a
parents 2adb28dc 394211dd

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

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.UserHandle; 
import com.android.settings.testutils.FakeFeatureFactory;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -316,6 +317,7 @@ public final class ConvertUtilsTest { 
            .isEqualTo(entry.mConsumePower * ratio);

    }



    @Ignore

    @Test

    public void testUtcToLocalTime_returnExpectedResult() {

        ConvertUtils.sZoneId = null;
@@ -336,6 +338,7 @@ public final class ConvertUtilsTest { 
        assertThat(ConvertUtils.sLocale).isEqualTo(new Locale("en_US"));

    }



    @Ignore

    @Test

    public void testUtcToLocalTimeHour_12HourFormat_returnExpectedResult() {

        ConvertUtils.sZoneIdForHour = null;
@@ -357,6 +360,7 @@ public final class ConvertUtilsTest { 
        assertThat(ConvertUtils.sLocaleForHour).isEqualTo(new Locale("en_US"));

    }



    @Ignore

    @Test

    public void testUtcToLocalTimeHour_24HourFormat_returnExpectedResult() {

        ConvertUtils.sZoneIdForHour = null;