commit 34f43b50ce16a6a75c62bbc5c95cae54e5d7d0be
author Andreas Gampe <agampe@google.com> Wed Feb 28 04:37:06 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 28 04:37:06 2018 +0000
tree 7f5fa9345e6ce6f67515b597c108018b84773542
parent eb664426c50dfcf08fab239b967e3511a393155f
parent 59a548b940c951bb6d95082e346a603257baadd3

Merge changes I06df032d,Ib923de28
am: 59a548b940

Change-Id: I4d1314379ba77c07b64c3ca5c77a61f9a54d4c1d

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

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 48a48b1..8b1da1b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -67,6 +67,7 @@
 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 @@
                 any());
     }
 
+    @Ignore("b/73892008")
     @Test
     public void testShowBothEstimates_summariesAreBothModified() {
         doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
@@ -495,8 +497,8 @@
         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