From 22bad556a1863bff80c4ec517ada315f7b01890e Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 26 Feb 2018 11:28:21 -0800 Subject: [PATCH] Settings: Fix assertThat in tests Truth.assertThat is a fluent-style API. Fix the tests to actually do something. Found by errorprone. Bug: 73513670 Test: m RunSettingsRoboTests Test: m javac-check RUN_ERROR_PRONE=true Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024 --- .../settings/fuelgauge/PowerUsageSummaryLegacyTest.java | 4 ++-- .../com/android/settings/fuelgauge/PowerUsageSummaryTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java index 79c7fd0f7fe..02d4b5f7023 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java @@ -452,8 +452,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..d8f66a24a19 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -260,8 +260,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