From 837c1abc531079d37df9e143b96746227fec028a Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Wed, 4 Sep 2019 10:35:09 -0400 Subject: [PATCH] Fix flaky test Prevents NPE in test by inverting the order of equals. Also, to make the test more independent, set the setting in setup Test: atest QSTileHostTest after deleting the setting Bug: 138516392 Change-Id: I7093cafaecaa6922c4dc07bcbdaed4b5c08aae60 --- .../tests/src/com/android/systemui/qs/QSTileHostTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java index f2292fd96b8da..07fbbcf4f1526 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java @@ -97,6 +97,8 @@ public class QSTileHostTest extends SysuiTestCase { mLooper.getLooper(), mPluginManager, mTunerService, mAutoTiles, mDumpController); setUpTileFactory(); + Settings.Secure.putStringForUser(mContext.getContentResolver(), QSTileHost.TILES_SETTING, + "", ActivityManager.getCurrentUser()); } private void setUpTileFactory() { @@ -188,7 +190,8 @@ public class QSTileHostTest extends SysuiTestCase { // changed String newSetting = Settings.Secure.getStringForUser(getContext().getContentResolver(), TILES_SETTING, ActivityManager.getCurrentUser()); - if (!previousSetting.equals(newSetting)) { + // newSetting is not null, as it has just been set. + if (!newSetting.equals(previousSetting)) { onTuningChanged(TILES_SETTING, newSetting); } }