PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I06df032d,Ib923de28

Browse Source 
* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests
This commit is contained in:
TreeHugger Robot
2018-02-26 21:51:01 +00:00
committed by Android (Google) Code Review
parent d93d1de3d6 b506fb9b19
commit ca4fd1b7dc
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java
View File

@@ -67,6 +67,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.StringUtil;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -444,6 +445,7 @@ public class PowerUsageSummaryLegacyTest {
eq(Bundle.EMPTY), any()); eq(Bundle.EMPTY), any());
} }
@Ignore("b/73892008")
@Test @Test
public void testShowBothEstimates_summariesAreBothModified() { public void testShowBothEstimates_summariesAreBothModified() {
doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2); 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 summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2); TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2);
Robolectric.flushBackgroundThreadScheduler(); Robolectric.flushBackgroundThreadScheduler();
assertThat(summary2.getText().toString().contains(NEW_ML_EST_SUFFIX)); assertThat(summary2.getText().toString()).contains(NEW_ML_EST_SUFFIX);
assertThat(summary1.getText().toString().contains(OLD_EST_SUFFIX)); assertThat(summary1.getText().toString()).contains(OLD_EST_SUFFIX);
} }
@Test @Test

6
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -56,6 +56,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -252,6 +253,7 @@ public class PowerUsageSummaryTest {
eq(Bundle.EMPTY), any()); eq(Bundle.EMPTY), any());
} }
@Ignore("b/73892008")
@Test @Test
public void testShowBothEstimates_summariesAreBothModified() { public void testShowBothEstimates_summariesAreBothModified() {
doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2); 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 summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2); TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2);
Robolectric.flushBackgroundThreadScheduler(); Robolectric.flushBackgroundThreadScheduler();
assertThat(summary2.getText().toString().contains(NEW_ML_EST_SUFFIX)); assertThat(summary2.getText().toString()).contains(NEW_ML_EST_SUFFIX);
assertThat(summary1.getText().toString().contains(OLD_EST_SUFFIX)); assertThat(summary1.getText().toString()).contains(OLD_EST_SUFFIX);
} }
@Test @Test