Skip to content

GitLab

T
tangled
Commit 3c9698f2 authored by Wenyu Fu's avatar Wenyu Fu Committed by Commit Bot
Browse files
Options

Remove SettingsActivityTest#startSettingsActivity 

As follow-up of the creation of SettingsActivityTestRule. Move all the
calls from SettingsActivityTest#startSettingsActivity to
SettingsActivityTestRule#startSettingsActivity.

Bug: 1066660
Change-Id: Ibf54ac73c82118bdfb53451b01e3a4aba982b912
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134941
Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758649}
parent cfd7ad6e
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 217 deletions
chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettingsTest.java
View file @ 3c9698f2
......@@ -17,13 +17,15 @@ import android.support.test.filters.SmallTest;
import androidx.preference.Preference;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.chromium.base.task.PostTask;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.accessibility.FontSizePrefs;
import org.chromium.chrome.browser.settings.SettingsActivityTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;
import org.chromium.content_public.browser.UiThreadTaskTraits;
......@@ -38,6 +40,15 @@ import java.text.NumberFormat;
*/
@RunWith(ChromeJUnit4ClassRunner.class)
public class AccessibilitySettingsTest {
@Rule
public SettingsActivityTestRule<AccessibilitySettings> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(AccessibilitySettings.class);
@Before
public void setUp() {
mSettingsActivityTestRule.startSettingsActivity();
}
/**
* Tests setting FontScaleFactor and ForceEnableZoom in AccessibilitySettings and ensures
* that ForceEnableZoom changes corresponding to FontScaleFactor.
......@@ -46,12 +57,7 @@ public class AccessibilitySettingsTest {
@SmallTest
@Feature({"Accessibility"})
public void testAccessibilitySettings() throws Exception {
String accessibilitySettingsClassname = AccessibilitySettings.class.getName();
AccessibilitySettings accessibilitySettings =
(AccessibilitySettings) SettingsActivityTest
.startSettingsActivity(InstrumentationRegistry.getInstrumentation(),
accessibilitySettingsClassname)
.getMainFragment();
AccessibilitySettings accessibilitySettings = mSettingsActivityTestRule.getFragment();
TextScalePreference textScalePref =
(TextScalePreference) accessibilitySettings.findPreference(
AccessibilitySettings.PREF_TEXT_SCALE);
......@@ -98,12 +104,7 @@ public class AccessibilitySettingsTest {
@SmallTest
@Feature({"Accessibility"})
public void testCaptionPreferences() {
String accessibilitySettingsClassname = AccessibilitySettings.class.getName();
AccessibilitySettings accessibilitySettings =
(AccessibilitySettings) SettingsActivityTest
.startSettingsActivity(InstrumentationRegistry.getInstrumentation(),
accessibilitySettingsClassname)
.getMainFragment();
AccessibilitySettings accessibilitySettings = mSettingsActivityTestRule.getFragment();
Preference captionsPref =
accessibilitySettings.findPreference(AccessibilitySettings.PREF_CAPTIONS);
Assert.assertNotNull(captionsPref);
......
chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java
View file @ 3c9698f2
......@@ -4,7 +4,6 @@
package org.chromium.chrome.browser.autofill.settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.view.KeyEvent;
import android.widget.EditText;
......@@ -24,7 +23,7 @@ import org.chromium.chrome.browser.autofill.AutofillTestHelper;
import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.content_public.browser.test.util.Criteria;
import org.chromium.content_public.browser.test.util.CriteriaHelper;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
......@@ -41,6 +40,9 @@ import java.util.concurrent.TimeoutException;
public class AutofillProfilesFragmentTest {
@Rule
public final AutofillTestRule rule = new AutofillTestRule();
@Rule
public final SettingsActivityTestRule<AutofillProfilesFragment> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(AutofillProfilesFragment.class);
@Before
public void setUp() throws TimeoutException {
......@@ -65,9 +67,7 @@ public class AutofillProfilesFragmentTest {
@MediumTest
@Feature({"Preferences"})
public void testAddProfile() throws Exception {
SettingsActivity activity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
AutofillProfilesFragment.class.getName());
SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
AutofillProfilesFragment autofillProfileFragment =
(AutofillProfilesFragment) activity.getMainFragment();
......@@ -108,9 +108,7 @@ public class AutofillProfilesFragmentTest {
@MediumTest
@Feature({"Preferences"})
public void testAddIncompletedProfile() throws Exception {
SettingsActivity activity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
AutofillProfilesFragment.class.getName());
SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
AutofillProfilesFragment autofillProfileFragment =
(AutofillProfilesFragment) activity.getMainFragment();
......@@ -133,9 +131,7 @@ public class AutofillProfilesFragmentTest {
@MediumTest
@Feature({"Preferences"})
public void testDeleteProfile() throws Exception {
SettingsActivity activity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
AutofillProfilesFragment.class.getName());
SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
AutofillProfilesFragment autofillProfileFragment =
(AutofillProfilesFragment) activity.getMainFragment();
......@@ -167,9 +163,7 @@ public class AutofillProfilesFragmentTest {
@MediumTest
@Feature({"Preferences"})
public void testEditProfile() throws Exception {
SettingsActivity activity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
AutofillProfilesFragment.class.getName());
SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
AutofillProfilesFragment autofillProfileFragment =
(AutofillProfilesFragment) activity.getMainFragment();
......@@ -211,9 +205,7 @@ public class AutofillProfilesFragmentTest {
@MediumTest
@Feature({"Preferences"})
public void testOpenProfileWithCompleteState() throws Exception {
SettingsActivity activity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
AutofillProfilesFragment.class.getName());
SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
AutofillProfilesFragment autofillProfileFragment =
(AutofillProfilesFragment) activity.getMainFragment();
......@@ -239,11 +231,8 @@ public class AutofillProfilesFragmentTest {
@MediumTest
@Feature({"Preferences"})
public void testOpenProfileWithInvalidState() throws Exception {
SettingsActivity activity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
AutofillProfilesFragment.class.getName());
AutofillProfilesFragment autofillProfileFragment =
(AutofillProfilesFragment) activity.getMainFragment();
SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
AutofillProfilesFragment autofillProfileFragment = mSettingsActivityTestRule.getFragment();
// Check the preferences on the initial screen.
Assert.assertEquals(6 /* One toggle + one add button + four profiles. */,
......@@ -267,9 +256,7 @@ public class AutofillProfilesFragmentTest {
@MediumTest
@Feature({"Preferences"})
public void testKeyboardShownOnDpadCenter() throws TimeoutException {
SettingsActivity activity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
AutofillProfilesFragment.class.getName());
SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
AutofillProfilesFragment fragment = (AutofillProfilesFragment) activity.getMainFragment();
AutofillProfileEditorPreference addProfile =
......
chrome/android/javatests/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragmentTest.java
View file @ 3c9698f2
......@@ -8,12 +8,12 @@ import static org.chromium.chrome.browser.flags.ChromeFeatureList.DARKEN_WEBSITE
import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_DARKEN_WEBSITES_ENABLED;
import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_SETTING;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.view.View;
import android.widget.LinearLayout;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -26,8 +26,7 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.night_mode.NightModeUtils;
import org.chromium.chrome.browser.night_mode.ThemeType;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.components.browser_ui.widget.RadioButtonWithDescription;
......@@ -51,6 +50,10 @@ public class ThemeSettingsFragmentTest extends DummyUiActivityTestCase {
Arrays.asList(new ParameterSet().value(false).name("DefaultLightDisabled"),
new ParameterSet().value(true).name("DefaultLightEnabled"));
@Rule
public SettingsActivityTestRule<ThemeSettingsFragment> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(ThemeSettingsFragment.class);
private boolean mDefaultToLight;
private ThemeSettingsFragment mFragment;
private RadioButtonGroupThemePreference mPreference;
......@@ -65,10 +68,8 @@ public class ThemeSettingsFragmentTest extends DummyUiActivityTestCase {
super.setUpTest();
SharedPreferencesManager.getInstance().removeKey(UI_THEME_SETTING);
SharedPreferencesManager.getInstance().removeKey(UI_THEME_DARKEN_WEBSITES_ENABLED);
SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(),
ThemeSettingsFragment.class.getName());
mFragment = (ThemeSettingsFragment) settingsActivity.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
mFragment = mSettingsActivityTestRule.getFragment();
mPreference = (RadioButtonGroupThemePreference) mFragment.findPreference(
ThemeSettingsFragment.PREF_UI_THEME_PREF);
}
......
chrome/android/javatests/src/org/chromium/chrome/browser/notifications/settings/NotificationSettingsTest.java
View file @ 3c9698f2
......@@ -5,7 +5,6 @@
package org.chromium.chrome.browser.notifications.settings;
import android.os.Build;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import androidx.fragment.app.Fragment;
......@@ -24,7 +23,7 @@ import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchPrefs;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.browser.site_settings.ContentSettingsResources;
import org.chromium.chrome.browser.site_settings.SingleCategorySettings;
import org.chromium.chrome.browser.site_settings.SiteSettingsCategory;
......@@ -45,6 +44,9 @@ import org.chromium.content_public.browser.test.util.TestThreadUtils;
public class NotificationSettingsTest {
@Rule
public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
@Rule
public final SettingsActivityTestRule<NotificationSettings> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(NotificationSettings.class);
private SettingsActivity mActivity;
@Rule
......@@ -52,8 +54,7 @@ public class NotificationSettingsTest {
@Before
public void setUp() {
mActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), NotificationSettings.class.getName());
mActivity = mSettingsActivityTestRule.startSettingsActivity();
}
// TODO(https://crbug.com/894334): Remove format suppression once formatting bug is fixed.
......@@ -66,8 +67,7 @@ public class NotificationSettingsTest {
public void testContentSuggestionsToggle() {
// clang-format on
final PreferenceFragmentCompat fragment =
(PreferenceFragmentCompat) mActivity.getMainFragment();
final PreferenceFragmentCompat fragment = mSettingsActivityTestRule.getFragment();
final ChromeSwitchPreference toggle = (ChromeSwitchPreference) fragment.findPreference(
NotificationSettings.PREF_SUGGESTIONS);
......@@ -103,7 +103,7 @@ public class NotificationSettingsTest {
public void testToggleDisabledWhenPrefetchingDisabled() {
// clang-format on
PreferenceFragmentCompat fragment = (PreferenceFragmentCompat) mActivity.getMainFragment();
PreferenceFragmentCompat fragment = mSettingsActivityTestRule.getFragment();
ChromeSwitchPreference toggle = (ChromeSwitchPreference) fragment.findPreference(
NotificationSettings.PREF_SUGGESTIONS);
......@@ -123,8 +123,7 @@ public class NotificationSettingsTest {
// clang-format on
TestThreadUtils.runOnUiThreadBlocking(() -> {
PreferenceFragmentCompat fragment =
(PreferenceFragmentCompat) mActivity.getMainFragment();
PreferenceFragmentCompat fragment = mSettingsActivityTestRule.getFragment();
Preference fromWebsites =
fragment.findPreference(NotificationSettings.PREF_FROM_WEBSITES);
......@@ -154,8 +153,7 @@ public class NotificationSettingsTest {
public void testWebsiteNotificationsSummary() {
// clang-format on
final PreferenceFragmentCompat fragment =
(PreferenceFragmentCompat) mActivity.getMainFragment();
final PreferenceFragmentCompat fragment = mSettingsActivityTestRule.getFragment();
final Preference fromWebsites =
fragment.findPreference(NotificationSettings.PREF_FROM_WEBSITES);
......
chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTest.java
View file @ 3c9698f2
......@@ -96,7 +96,7 @@ import org.chromium.chrome.browser.history.StubbedHistoryProvider;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.browser.settings.SettingsLauncher;
import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.test.ChromeBrowserTestRule;
......@@ -137,6 +137,10 @@ public class PasswordSettingsTest {
public IntentsTestRule<HistoryActivity> mHistoryActivityTestRule =
new IntentsTestRule<>(HistoryActivity.class, false, false);
@Rule
public SettingsActivityTestRule<PasswordSettings> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(PasswordSettings.class);
private static final class FakePasswordManagerHandler implements PasswordManagerHandler {
// This class has exactly one observer, set on construction and expected to last at least as
// long as this object (a good candidate is the owner of this object).
......@@ -432,7 +436,7 @@ public class PasswordSettingsTest {
TestThreadUtils.runOnUiThreadBlocking(() -> {
// Disable the timer for progress bar.
PasswordSettings fragment = (PasswordSettings) settingsActivity.getMainFragment();
PasswordSettings fragment = mSettingsActivityTestRule.getFragment();
fragment.getExportFlowForTesting()
.getDialogManagerForTesting()
.replaceCallbackDelayerForTesting(mManualDelayer);
......@@ -481,7 +485,7 @@ public class PasswordSettingsTest {
private void requestShowingExportErrorWithButton(
SettingsActivity settingsActivity, int positiveButtonLabelId) {
TestThreadUtils.runOnUiThreadBlocking(() -> {
PasswordSettings fragment = (PasswordSettings) settingsActivity.getMainFragment();
PasswordSettings fragment = mSettingsActivityTestRule.getFragment();
// To show an error, the error type for UMA needs to be specified. Because it is not
// relevant for cases when the error is forcibly displayed in tests,
// HistogramExportResult.NO_CONSUMER is passed as an arbitrarily chosen value.
......@@ -532,12 +536,10 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testResetListEmpty() {
// Load the preferences, they should show the empty list.
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
TestThreadUtils.runOnUiThreadBlocking(() -> {
PasswordSettings savePasswordPreferences =
(PasswordSettings) settingsActivity.getMainFragment();
PasswordSettings savePasswordPreferences = mSettingsActivityTestRule.getFragment();
// Emulate an update from PasswordStore. This should not crash.
savePasswordPreferences.passwordListAvailable(0);
});
......@@ -555,12 +557,10 @@ public class PasswordSettingsTest {
PrefServiceBridge.getInstance().setBoolean(Pref.REMEMBER_PASSWORDS_ENABLED, true);
});
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
TestThreadUtils.runOnUiThreadBlocking(() -> {
PasswordSettings savedPasswordPrefs =
(PasswordSettings) settingsActivity.getMainFragment();
PasswordSettings savedPasswordPrefs = mSettingsActivityTestRule.getFragment();
ChromeSwitchPreference onOffSwitch =
(ChromeSwitchPreference) savedPasswordPrefs.findPreference(
PasswordSettings.PREF_SAVE_PASSWORDS_SWITCH);
......@@ -578,11 +578,9 @@ public class PasswordSettingsTest {
PrefServiceBridge.getInstance().setBoolean(Pref.REMEMBER_PASSWORDS_ENABLED, false);
});
final SettingsActivity settingsActivity2 = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
TestThreadUtils.runOnUiThreadBlocking(() -> {
PasswordSettings savedPasswordPrefs =
(PasswordSettings) settingsActivity2.getMainFragment();
PasswordSettings savedPasswordPrefs = mSettingsActivityTestRule.getFragment();
ChromeSwitchPreference onOffSwitch =
(ChromeSwitchPreference) savedPasswordPrefs.findPreference(
PasswordSettings.PREF_SAVE_PASSWORDS_SWITCH);
......@@ -601,9 +599,8 @@ public class PasswordSettingsTest {
// Add a password entry, because the link is only displayed if the password list is not
// empty.
setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
PasswordSettings savedPasswordPrefs = (PasswordSettings) settingsActivity.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
PasswordSettings savedPasswordPrefs = mSettingsActivityTestRule.getFragment();
Assert.assertNull(
savedPasswordPrefs.findPreference(PasswordSettings.PREF_KEY_MANAGE_ACCOUNT_LINK));
}
......@@ -622,9 +619,8 @@ public class PasswordSettingsTest {
overrideProfileSyncService(false, false);
SigninTestUtil.addAndSignInTestAccount();
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
PasswordSettings savedPasswordPrefs = (PasswordSettings) settingsActivity.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
PasswordSettings savedPasswordPrefs = mSettingsActivityTestRule.getFragment();
Assert.assertNull(
savedPasswordPrefs.findPreference(PasswordSettings.PREF_KEY_MANAGE_ACCOUNT_LINK));
......@@ -644,9 +640,8 @@ public class PasswordSettingsTest {
overrideProfileSyncService(false, true);
SigninTestUtil.addAndSignInTestAccount();
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
PasswordSettings savedPasswordPrefs = (PasswordSettings) settingsActivity.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
PasswordSettings savedPasswordPrefs = mSettingsActivityTestRule.getFragment();
Assert.assertNotNull(
savedPasswordPrefs.findPreference(PasswordSettings.PREF_KEY_MANAGE_ACCOUNT_LINK));
......@@ -666,9 +661,8 @@ public class PasswordSettingsTest {
overrideProfileSyncService(true, true);
SigninTestUtil.addAndSignInTestAccount();
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
PasswordSettings savedPasswordPrefs = (PasswordSettings) settingsActivity.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
PasswordSettings savedPasswordPrefs = mSettingsActivityTestRule.getFragment();
Assert.assertNull(
savedPasswordPrefs.findPreference(PasswordSettings.PREF_KEY_MANAGE_ACCOUNT_LINK));
......@@ -687,11 +681,10 @@ public class PasswordSettingsTest {
Pref.PASSWORD_MANAGER_AUTO_SIGNIN_ENABLED, true);
});
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
TestThreadUtils.runOnUiThreadBlocking(() -> {
PasswordSettings passwordPrefs = (PasswordSettings) settingsActivity.getMainFragment();
PasswordSettings passwordPrefs = mSettingsActivityTestRule.getFragment();
ChromeBaseCheckBoxPreference onOffSwitch =
(ChromeBaseCheckBoxPreference) passwordPrefs.findPreference(
PasswordSettings.PREF_AUTOSIGNIN_SWITCH);
......@@ -710,10 +703,9 @@ public class PasswordSettingsTest {
Pref.PASSWORD_MANAGER_AUTO_SIGNIN_ENABLED, false);
});
final SettingsActivity settingsActivity2 = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
TestThreadUtils.runOnUiThreadBlocking(() -> {
PasswordSettings passwordPrefs = (PasswordSettings) settingsActivity2.getMainFragment();
PasswordSettings passwordPrefs = mSettingsActivityTestRule.getFragment();
ChromeBaseCheckBoxPreference onOffSwitch =
(ChromeBaseCheckBoxPreference) passwordPrefs.findPreference(
PasswordSettings.PREF_AUTOSIGNIN_SWITCH);
......@@ -737,8 +729,7 @@ public class PasswordSettingsTest {
"example user", "example password"),
new SavedPasswordEntry("https://test.com", "test user", "test password")});
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(withText(containsString("test user"))).perform(click());
......@@ -782,8 +773,7 @@ public class PasswordSettingsTest {
mMockPasswordEditingDelegate);
setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(withText(containsString("test user"))).perform(click());
......@@ -812,8 +802,7 @@ public class PasswordSettingsTest {
mMockPasswordEditingDelegate);
setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(withText(containsString("test user"))).perform(click());
......@@ -879,8 +868,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setApiOverride(ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
checkExportMenuItemState(MenuItemState.DISABLED);
}
......@@ -896,8 +884,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setApiOverride(ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
checkExportMenuItemState(MenuItemState.ENABLED);
}
......@@ -915,8 +902,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
openActionBarOverflowOrOptionsMenu(
InstrumentationRegistry.getInstrumentation().getTargetContext());
......@@ -944,8 +930,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -968,8 +953,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1016,8 +1000,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.UNAVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
View mainDecorView = settingsActivity.getWindow().getDecorView();
openActionBarOverflowOrOptionsMenu(
......@@ -1042,8 +1025,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.UNAVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Trigger exporting and let it fail on the unavailable lock.
openActionBarOverflowOrOptionsMenu(
......@@ -1067,8 +1049,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setApiOverride(ReauthenticationManager.OverrideState.AVAILABLE);
ReauthenticationManager.setSkipSystemReauth(true);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
openActionBarOverflowOrOptionsMenu(
InstrumentationRegistry.getInstrumentation().getTargetContext());
......@@ -1094,8 +1075,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Ensure that the last reauthentication time stamp is recent enough.
ReauthenticationManager.recordLastReauth(
......@@ -1131,8 +1111,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
Intents.init();
......@@ -1172,8 +1151,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
Intents.init();
......@@ -1219,8 +1197,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1245,8 +1222,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1280,8 +1256,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
openActionBarOverflowOrOptionsMenu(
InstrumentationRegistry.getInstrumentation().getTargetContext());
......@@ -1321,8 +1296,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1350,8 +1324,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
Intents.init();
......@@ -1409,8 +1382,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
Intents.init();
......@@ -1462,8 +1434,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1499,8 +1470,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1538,8 +1508,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1573,8 +1542,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1619,8 +1587,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
reauthenticateAndRequestExport(settingsActivity);
......@@ -1658,8 +1625,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.UNAVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
final SettingsActivity settingsActivity = mSettingsActivityTestRule.startSettingsActivity();
View mainDecorView = settingsActivity.getWindow().getDecorView();
Espresso.onView(withText(containsString("test user"))).perform(click());
......@@ -1684,8 +1650,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(withText(containsString("test user"))).perform(click());
......@@ -1707,11 +1672,8 @@ public class PasswordSettingsTest {
@SuppressWarnings("AlwaysShowAction") // We need to ensure the icon is in the action bar.
public void testSearchIconVisibleInActionBarWithFeature() {
setPasswordSource(null); // Initialize empty preferences.
PasswordSettings f =
(PasswordSettings) SettingsActivityTest
.startSettingsActivity(InstrumentationRegistry.getInstrumentation(),
PasswordSettings.class.getName())
.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
PasswordSettings f = mSettingsActivityTestRule.getFragment();
// Force the search option into the action bar.
TestThreadUtils.runOnUiThreadBlocking(
......@@ -1734,8 +1696,7 @@ public class PasswordSettingsTest {
setPasswordSource( // Initialize preferences
new SavedPasswordEntry("https://example.com", "test user", "test password"));
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(withText(containsString("test user"))).perform(click());
......@@ -1749,12 +1710,9 @@ public class PasswordSettingsTest {
@SmallTest
@Feature({"Preferences"})
public void testSearchTextInOverflowMenuVisibleWithFeature() {
setPasswordSource(null); // Initialize empty preferences.
PasswordSettings f =
(PasswordSettings) SettingsActivityTest
.startSettingsActivity(InstrumentationRegistry.getInstrumentation(),
PasswordSettings.class.getName())
.getMainFragment();
setPasswordSource(null); // Initialize empty preferences.mSettingsActivityTestRule
mSettingsActivityTestRule.startSettingsActivity();
PasswordSettings f = mSettingsActivityTestRule.getFragment();
// Force the search option into the overflow menu.
TestThreadUtils.runOnUiThreadBlocking(
......@@ -1779,8 +1737,7 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testTriggeringSearchRestoresHelpIcon() {
setPasswordSource(null);
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(isRoot()).check(waitForView(withText(R.string.password_settings_title)));
// Retrieve the initial status and ensure that the help option is there at all.
......@@ -1824,8 +1781,7 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchFiltersByUserName() {
setPasswordSourceWithMultipleEntries(GREEK_GODS);
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Search for a string matching multiple user names. Case doesn't need to match.
Espresso.onView(withSearchMenuIdOrText()).perform(click());
......@@ -1847,8 +1803,7 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchFiltersByUrl() {
setPasswordSourceWithMultipleEntries(GREEK_GODS);
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Search for a string that matches multiple URLs. Case doesn't need to match.
Espresso.onView(withSearchMenuIdOrText()).perform(click());
......@@ -1870,8 +1825,7 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchDisplaysNoResultMessageIfSearchTurnsUpEmpty() {
setPasswordSourceWithMultipleEntries(GREEK_GODS);
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Open the search which should hide the Account link.
Espresso.onView(withSearchMenuIdOrText()).perform(click());
......@@ -1903,11 +1857,7 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchIconClickedHidesExceptionsTemporarily() {
setPasswordExceptions(new String[] {"http://exclu.de", "http://not-inclu.de"});
final PasswordSettings savePasswordPreferences =
(PasswordSettings) SettingsActivityTest
.startSettingsActivity(InstrumentationRegistry.getInstrumentation(),
PasswordSettings.class.getName())
.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(withText(R.string.section_saved_passwords_exceptions))
.check(matches(isDisplayed()));
......@@ -1934,11 +1884,8 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchIconClickedHidesGeneralPrefs() {
setPasswordSource(ZEUS_ON_EARTH);
final PasswordSettings prefs =
(PasswordSettings) SettingsActivityTest
.startSettingsActivity(InstrumentationRegistry.getInstrumentation(),
PasswordSettings.class.getName())
.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
final PasswordSettings prefs = mSettingsActivityTestRule.getFragment();
final AtomicReference<Boolean> menuInitiallyVisible = new AtomicReference<>();
TestThreadUtils.runOnUiThreadBlocking(
()
......@@ -1976,8 +1923,7 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchBarBackButtonRestoresGeneralPrefs() {
setPasswordSourceWithMultipleEntries(GREEK_GODS);
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
Espresso.onView(withSearchMenuIdOrText()).perform(click());
Espresso.onView(withId(R.id.search_src_text))
......@@ -2002,8 +1948,7 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchViewCloseIconExistsOnlyToClearQueries() {
setPasswordSourceWithMultipleEntries(GREEK_GODS);
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Trigger search which shouldn't have the button yet.
Espresso.onView(withSearchMenuIdOrText()).perform(click());
......@@ -2032,11 +1977,8 @@ public class PasswordSettingsTest {
@Feature({"Preferences"})
public void testSearchIconColorAffectsOnlyLocalSearchDrawable() {
// Open the password preferences and remember the applied color filter.
final PasswordSettings f =
(PasswordSettings) SettingsActivityTest
.startSettingsActivity(InstrumentationRegistry.getInstrumentation(),
PasswordSettings.class.getName())
.getMainFragment();
mSettingsActivityTestRule.startSettingsActivity();
final PasswordSettings f = mSettingsActivityTestRule.getFragment();
Espresso.onView(withId(R.id.search_button)).check(matches(isDisplayed()));
final AtomicReference<ColorFilter> passwordSearchFilter = new AtomicReference<>();
TestThreadUtils.runOnUiThreadBlocking(() -> {
......@@ -2085,8 +2027,7 @@ public class PasswordSettingsTest {
ReauthenticationManager.setApiOverride(ReauthenticationManager.OverrideState.AVAILABLE);
ReauthenticationManager.setScreenLockSetUpOverride(
ReauthenticationManager.OverrideState.AVAILABLE);
SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), PasswordSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Open the search and filter all but "Zeus".
Espresso.onView(withSearchMenuIdOrText()).perform(click());
......
chrome/android/javatests/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineSettingsTest.java
View file @ 3c9698f2
......@@ -24,7 +24,7 @@ import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.chrome.browser.settings.MainSettings;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.browser.site_settings.ContentSettingValues;
import org.chromium.chrome.browser.site_settings.PermissionInfo;
import org.chromium.chrome.browser.site_settings.WebsitePreferenceBridgeJni;
......@@ -51,6 +51,9 @@ import java.util.concurrent.ExecutionException;
public class SearchEngineSettingsTest {
@Rule
public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
@Rule
public final SettingsActivityTestRule<SearchEngineSettings> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(SearchEngineSettings.class);
/**
* Change search engine and make sure it works correctly.
......@@ -63,12 +66,11 @@ public class SearchEngineSettingsTest {
public void testSearchEnginePreference() throws Exception {
ensureTemplateUrlServiceLoaded();
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), SearchEngineSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Set the second search engine as the default using TemplateUrlService.
TestThreadUtils.runOnUiThreadBlocking(() -> {
SearchEngineSettings pref = (SearchEngineSettings) settingsActivity.getMainFragment();
SearchEngineSettings pref = mSettingsActivityTestRule.getFragment();
pref.setValueForTesting("1");
// Ensure that the second search engine in the list is selected.
......@@ -178,18 +180,17 @@ public class SearchEngineSettingsTest {
public void testSearchEnginePreferenceHttp() throws Exception {
ensureTemplateUrlServiceLoaded();
final SettingsActivity settingsActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), SearchEngineSettings.class.getName());
mSettingsActivityTestRule.startSettingsActivity();
// Set the first search engine as the default using TemplateUrlService.
TestThreadUtils.runOnUiThreadBlocking(() -> {
SearchEngineSettings pref = (SearchEngineSettings) settingsActivity.getMainFragment();
SearchEngineSettings pref = mSettingsActivityTestRule.getFragment();
pref.setValueForTesting("0");
});
TestThreadUtils.runOnUiThreadBlocking(() -> {
// Ensure that the first search engine in the list is selected.
SearchEngineSettings pref = (SearchEngineSettings) settingsActivity.getMainFragment();
SearchEngineSettings pref = mSettingsActivityTestRule.getFragment();
Assert.assertNotNull(pref);
Assert.assertEquals("0", pref.getValueForTesting());
......
chrome/android/javatests/src/org/chromium/chrome/browser/settings/SettingsActivityTest.java
View file @ 3c9698f2
......@@ -10,13 +10,8 @@ import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
import android.content.Intent;
import android.support.test.filters.SmallTest;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -36,20 +31,6 @@ import org.chromium.policy.test.annotations.Policies;
*/
@RunWith(ChromeJUnit4ClassRunner.class)
public class SettingsActivityTest {
/**
* Launches the settings activity with the specified fragment.
* Returns the activity that was started.
*/
public static SettingsActivity startSettingsActivity(
Instrumentation instrumentation, String fragmentName) {
Context context = instrumentation.getTargetContext();
Intent intent =
SettingsLauncher.getInstance().createIntentForSettingsPage(context, fragmentName);
Activity activity = instrumentation.startActivitySync(intent);
Assert.assertTrue(activity instanceof SettingsActivity);
return (SettingsActivity) activity;
}
@Rule
public SettingsActivityTestRule<MainSettings> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(MainSettings.class);
......
chrome/android/javatests/src/org/chromium/chrome/browser/settings/language/LanguageSettingsTest.java
View file @ 3c9698f2
......@@ -15,7 +15,6 @@ import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.core.AllOf.allOf;
import android.support.test.InstrumentationRegistry;
import android.support.test.espresso.contrib.RecyclerViewActions;
import android.view.View;
import android.widget.ImageView;
......@@ -26,6 +25,7 @@ import androidx.test.filters.SmallTest;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -39,7 +39,7 @@ import org.chromium.chrome.browser.language.settings.LanguageSettings;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.browser.translate.TranslateBridge;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.browser.RecyclerViewTestUtils;
......@@ -56,13 +56,14 @@ import org.chromium.ui.test.util.UiRestriction;
@Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
public class LanguageSettingsTest {
// clang-format on
@Rule
public final SettingsActivityTestRule<LanguageSettings> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(LanguageSettings.class);
private SettingsActivity mActivity;
@Before
public void setUp() throws Exception {
mActivity = SettingsActivityTest.startSettingsActivity(
InstrumentationRegistry.getInstrumentation(), LanguageSettings.class.getName());
mActivity = mSettingsActivityTestRule.startSettingsActivity();
}
private void addLanguage() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment