diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java index 79c7fd0f7fe..c4b6aeabbd2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java @@ -67,6 +67,7 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.utils.StringUtil; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -444,6 +445,7 @@ public class PowerUsageSummaryLegacyTest { eq(Bundle.EMPTY), any()); } + @Ignore("b/73892008") @Test public void testShowBothEstimates_summariesAreBothModified() { doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2); @@ -452,8 +454,8 @@ public class PowerUsageSummaryLegacyTest { 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 diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 1debe85ca3c..336df87a2cd 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -56,6 +56,7 @@ import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -252,6 +253,7 @@ public class PowerUsageSummaryTest { eq(Bundle.EMPTY), any()); } + @Ignore("b/73892008") @Test public void testShowBothEstimates_summariesAreBothModified() { doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2); @@ -260,8 +262,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