Merge "Fix flake issue on SettingsRoboTests" into sc-dev

This commit is contained in:
Menghan Li
2021-05-18 04:36:32 +00:00
committed by Android (Google) Code Review
4 changed files with 8 additions and 0 deletions

View File

@@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner;
public class AccessibilityButtonFooterPreferenceControllerTest { public class AccessibilityButtonFooterPreferenceControllerTest {
private static final String TEST_KEY = "test_key"; private static final String TEST_KEY = "test_key";
private static final String TEST_TITLE = "test_title";
private final Context mContext = ApplicationProvider.getApplicationContext(); private final Context mContext = ApplicationProvider.getApplicationContext();
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private AccessibilityButtonFooterPreferenceController mController; private AccessibilityButtonFooterPreferenceController mController;
@@ -47,6 +48,7 @@ public class AccessibilityButtonFooterPreferenceControllerTest {
final AccessibilityFooterPreference footerPreference = final AccessibilityFooterPreference footerPreference =
new AccessibilityFooterPreference(mContext); new AccessibilityFooterPreference(mContext);
footerPreference.setKey(TEST_KEY); footerPreference.setKey(TEST_KEY);
footerPreference.setTitle(TEST_TITLE);
mScreen.addPreference(footerPreference); mScreen.addPreference(footerPreference);
mController = new AccessibilityButtonFooterPreferenceController(mContext, TEST_KEY); mController = new AccessibilityButtonFooterPreferenceController(mContext, TEST_KEY);
} }

View File

@@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner;
public class AccessibilityControlTimeoutFooterPreferenceControllerTest { public class AccessibilityControlTimeoutFooterPreferenceControllerTest {
private static final String TEST_KEY = "test_key"; private static final String TEST_KEY = "test_key";
private static final String TEST_TITLE = "test_title";
private final Context mContext = ApplicationProvider.getApplicationContext(); private final Context mContext = ApplicationProvider.getApplicationContext();
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private AccessibilityControlTimeoutFooterPreferenceController mController; private AccessibilityControlTimeoutFooterPreferenceController mController;
@@ -47,6 +48,7 @@ public class AccessibilityControlTimeoutFooterPreferenceControllerTest {
final AccessibilityFooterPreference footerPreference = final AccessibilityFooterPreference footerPreference =
new AccessibilityFooterPreference(mContext); new AccessibilityFooterPreference(mContext);
footerPreference.setKey(TEST_KEY); footerPreference.setKey(TEST_KEY);
footerPreference.setTitle(TEST_TITLE);
mScreen.addPreference(footerPreference); mScreen.addPreference(footerPreference);
mController = new AccessibilityControlTimeoutFooterPreferenceController(mContext, TEST_KEY); mController = new AccessibilityControlTimeoutFooterPreferenceController(mContext, TEST_KEY);
} }

View File

@@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner;
public class CaptionFooterPreferenceControllerTest { public class CaptionFooterPreferenceControllerTest {
private static final String TEST_KEY = "test_key"; private static final String TEST_KEY = "test_key";
private static final String TEST_TITLE = "test_title";
private final Context mContext = ApplicationProvider.getApplicationContext(); private final Context mContext = ApplicationProvider.getApplicationContext();
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private CaptionFooterPreferenceController mController; private CaptionFooterPreferenceController mController;
@@ -47,6 +48,7 @@ public class CaptionFooterPreferenceControllerTest {
final AccessibilityFooterPreference footerPreference = final AccessibilityFooterPreference footerPreference =
new AccessibilityFooterPreference(mContext); new AccessibilityFooterPreference(mContext);
footerPreference.setKey(TEST_KEY); footerPreference.setKey(TEST_KEY);
footerPreference.setTitle(TEST_TITLE);
mScreen.addPreference(footerPreference); mScreen.addPreference(footerPreference);
mController = new CaptionFooterPreferenceController(mContext, TEST_KEY); mController = new CaptionFooterPreferenceController(mContext, TEST_KEY);
} }

View File

@@ -36,6 +36,7 @@ import org.robolectric.RobolectricTestRunner;
public class ToggleAutoclickFooterPreferenceControllerTest { public class ToggleAutoclickFooterPreferenceControllerTest {
private static final String TEST_KEY = "test_key"; private static final String TEST_KEY = "test_key";
private static final String TEST_TITLE = "test_title";
private final Context mContext = ApplicationProvider.getApplicationContext(); private final Context mContext = ApplicationProvider.getApplicationContext();
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private ToggleAutoclickFooterPreferenceController mController; private ToggleAutoclickFooterPreferenceController mController;
@@ -47,6 +48,7 @@ public class ToggleAutoclickFooterPreferenceControllerTest {
final AccessibilityFooterPreference footerPreference = final AccessibilityFooterPreference footerPreference =
new AccessibilityFooterPreference(mContext); new AccessibilityFooterPreference(mContext);
footerPreference.setKey(TEST_KEY); footerPreference.setKey(TEST_KEY);
footerPreference.setTitle(TEST_TITLE);
mScreen.addPreference(footerPreference); mScreen.addPreference(footerPreference);
mController = new ToggleAutoclickFooterPreferenceController(mContext, TEST_KEY); mController = new ToggleAutoclickFooterPreferenceController(mContext, TEST_KEY);
} }