From 4a12cd51a68a13ce27c0b19938c645c6f4c40e6c Mon Sep 17 00:00:00 2001 From: menghanli Date: Tue, 18 May 2021 10:44:04 +0800 Subject: [PATCH] Fix flake issue on SettingsRoboTests Root cause: SpannableStringBuilder cannot handle the preference title is empty caes. Solution: Assign default value in test case setup. Bug: 188448957 Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityControlTimeoutFooterPreferenceControllerTest Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=CaptionFooterPreferenceControllerTest Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=ToggleAutoclickFooterPreferenceControllerTest Change-Id: Ia95a6ecba824d81e0ccf649975517231ecf475b3 --- .../AccessibilityButtonFooterPreferenceControllerTest.java | 2 ++ ...cessibilityControlTimeoutFooterPreferenceControllerTest.java | 2 ++ .../accessibility/CaptionFooterPreferenceControllerTest.java | 2 ++ .../ToggleAutoclickFooterPreferenceControllerTest.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java index 47914d83669..2640c813810 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java @@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner; public class AccessibilityButtonFooterPreferenceControllerTest { private static final String TEST_KEY = "test_key"; + private static final String TEST_TITLE = "test_title"; private final Context mContext = ApplicationProvider.getApplicationContext(); private PreferenceScreen mScreen; private AccessibilityButtonFooterPreferenceController mController; @@ -47,6 +48,7 @@ public class AccessibilityButtonFooterPreferenceControllerTest { final AccessibilityFooterPreference footerPreference = new AccessibilityFooterPreference(mContext); footerPreference.setKey(TEST_KEY); + footerPreference.setTitle(TEST_TITLE); mScreen.addPreference(footerPreference); mController = new AccessibilityButtonFooterPreferenceController(mContext, TEST_KEY); } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceControllerTest.java index 2f7a16f8199..23e479be539 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceControllerTest.java @@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner; public class AccessibilityControlTimeoutFooterPreferenceControllerTest { private static final String TEST_KEY = "test_key"; + private static final String TEST_TITLE = "test_title"; private final Context mContext = ApplicationProvider.getApplicationContext(); private PreferenceScreen mScreen; private AccessibilityControlTimeoutFooterPreferenceController mController; @@ -47,6 +48,7 @@ public class AccessibilityControlTimeoutFooterPreferenceControllerTest { final AccessibilityFooterPreference footerPreference = new AccessibilityFooterPreference(mContext); footerPreference.setKey(TEST_KEY); + footerPreference.setTitle(TEST_TITLE); mScreen.addPreference(footerPreference); mController = new AccessibilityControlTimeoutFooterPreferenceController(mContext, TEST_KEY); } diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptionFooterPreferenceControllerTest.java index b17dfc6c24e..e5f67c5f308 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptionFooterPreferenceControllerTest.java @@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner; public class CaptionFooterPreferenceControllerTest { private static final String TEST_KEY = "test_key"; + private static final String TEST_TITLE = "test_title"; private final Context mContext = ApplicationProvider.getApplicationContext(); private PreferenceScreen mScreen; private CaptionFooterPreferenceController mController; @@ -47,6 +48,7 @@ public class CaptionFooterPreferenceControllerTest { final AccessibilityFooterPreference footerPreference = new AccessibilityFooterPreference(mContext); footerPreference.setKey(TEST_KEY); + footerPreference.setTitle(TEST_TITLE); mScreen.addPreference(footerPreference); mController = new CaptionFooterPreferenceController(mContext, TEST_KEY); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceControllerTest.java index c94d62b663c..2be4752b4f5 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceControllerTest.java @@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner; public class ToggleAutoclickFooterPreferenceControllerTest { private static final String TEST_KEY = "test_key"; + private static final String TEST_TITLE = "test_title"; private final Context mContext = ApplicationProvider.getApplicationContext(); private PreferenceScreen mScreen; private ToggleAutoclickFooterPreferenceController mController; @@ -47,6 +48,7 @@ public class ToggleAutoclickFooterPreferenceControllerTest { final AccessibilityFooterPreference footerPreference = new AccessibilityFooterPreference(mContext); footerPreference.setKey(TEST_KEY); + footerPreference.setTitle(TEST_TITLE); mScreen.addPreference(footerPreference); mController = new ToggleAutoclickFooterPreferenceController(mContext, TEST_KEY); }