Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev (394211dd) · Commits · e / os / android_packages_apps_Settings

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;