From aaa4c7c951468ec73ad4b9c22c92401f179afa52 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Wed, 19 Jan 2022 10:35:46 +0800 Subject: [PATCH] Fix fail of AutomaticStorageManagerSwitchBarControllerTest initializingSwitchDoesNotTriggerView initializes mController with a mSwitchBar which has already addOnSwitchChangeListener, it will trigger onSwitchChangedon (and a dialog breaks the test) of a mController initialized at setUp(). This change initializes a new mSwitchBar for the test. Bug: 214907475 Test: make RunSettingsRoboTests ROBOTEST_FILTER=AutomaticStorageManagerSwitchBarControllerTest Change-Id: Iefe56387c56ca6b1c2520c050467d130182ccfdc --- .../AutomaticStorageManagerSwitchBarControllerTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index dcb1a50595c..17283cfaf38 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -38,7 +38,6 @@ import com.android.settings.widget.SettingsMainSwitchBar; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -138,13 +137,13 @@ public class AutomaticStorageManagerSwitchBarControllerTest { } @Test - @Ignore public void initializingSwitchDoesNotTriggerView() { Settings.Secure.putInt( mContext.getContentResolver(), Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 1); + mSwitchBar = new SettingsMainSwitchBar(mContext); mController = new AutomaticStorageManagerSwitchBarController( mContext,