Merge "Remove missed added testing locale to cause flaky" into sc-dev (fa476aef) · Commits · e / os / android_packages_apps_Settings

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		@@ -118,6 +119,7 @@ public final class BatteryChartPreferenceControllerTest {
		createBatteryHistoryMap());
		}

		@Ignore
		@Test
		public void testOnResume_uiModeIsChanged_clearBatteryDiffEntryCache() {
		doReturn(mResources).when(mContext).getResources();
		@@ -133,6 +135,7 @@ public final class BatteryChartPreferenceControllerTest {
		assertThat(BatteryDiffEntry.sResourceCache).isEmpty();
		}

		@Ignore
		@Test
		public void testOnResume_uiModeIsNotChanged_notClearBatteryDiffEntryCache() {
		doReturn(mResources).when(mContext).getResources();

+4 −2

Original line number	Diff line number	Diff line
		@@ -29,6 +29,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;
		@@ -60,8 +61,6 @@ 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
		@@ -317,6 +316,7 @@ public final class ConvertUtilsTest {
		.isEqualTo(entry.mConsumePower * ratio);
		}

		@Ignore
		@Test
		public void testUtcToLocalTime_returnExpectedResult() {
		ConvertUtils.sZoneId = null;
		@@ -335,6 +335,7 @@ public final class ConvertUtilsTest {
		assertThat(ConvertUtils.sLocale).isEqualTo(Locale.getDefault());
		}

		@Ignore
		@Test
		public void testUtcToLocalTimeHour_12HourFormat_returnExpectedResult() {
		ConvertUtils.sZoneIdForHour = null;
		@@ -353,6 +354,7 @@ public final class ConvertUtilsTest {
		assertThat(ConvertUtils.sLocaleForHour).isEqualTo(Locale.getDefault());
		}

		@Ignore
		@Test
		public void testUtcToLocalTimeHour_24HourFormat_returnExpectedResult() {
		ConvertUtils.sZoneIdForHour = null;