Merge changes I06df032d,Ib923de28 am: 59a548b940 (fd99b8b0) · Commits · e / os / android_packages_apps_Settings

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ import com.android.settings.testutils.shadow.SettingsShadowResources;
		import com.android.settingslib.core.AbstractPreferenceController;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Answers;
		@@ -487,6 +488,7 @@ public class PowerUsageSummaryTest {
		any());
		}

		@Ignore("b/73892008")
		@Test
		public void testShowBothEstimates_summariesAreBothModified() {
		doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
		@@ -495,8 +497,8 @@ public class PowerUsageSummaryTest {
		TextView summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
		TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2);
		Robolectric.flushBackgroundThreadScheduler();
		assertThat(summary2.getText().toString().contains(NEW_ML_EST_SUFFIX));
		assertThat(summary1.getText().toString().contains(OLD_EST_SUFFIX));
		assertThat(summary2.getText().toString()).contains(NEW_ML_EST_SUFFIX);
		assertThat(summary1.getText().toString()).contains(OLD_EST_SUFFIX);
		}

		@Test