OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 package org.chromium.chrome.browser.preferences.password; | 5 package org.chromium.chrome.browser.preferences.password; |
6 | 6 |
7 import android.test.suitebuilder.annotation.SmallTest; | 7 import android.test.suitebuilder.annotation.SmallTest; |
8 | 8 |
9 import org.chromium.base.CommandLine; | |
10 import org.chromium.base.ThreadUtils; | 9 import org.chromium.base.ThreadUtils; |
10 import org.chromium.base.test.util.CommandLineFlags; | |
11 import org.chromium.base.test.util.Feature; | 11 import org.chromium.base.test.util.Feature; |
12 import org.chromium.chrome.browser.ChromeFeatureList; | |
12 import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference; | 13 import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference; |
13 import org.chromium.chrome.browser.preferences.ChromeSwitchPreference; | 14 import org.chromium.chrome.browser.preferences.ChromeSwitchPreference; |
14 import org.chromium.chrome.browser.preferences.PrefServiceBridge; | 15 import org.chromium.chrome.browser.preferences.PrefServiceBridge; |
15 import org.chromium.chrome.browser.preferences.Preferences; | 16 import org.chromium.chrome.browser.preferences.Preferences; |
16 import org.chromium.chrome.browser.preferences.PreferencesTest; | 17 import org.chromium.chrome.browser.preferences.PreferencesTest; |
17 import org.chromium.content.browser.test.NativeLibraryTestBase; | 18 import org.chromium.content.browser.test.NativeLibraryTestBase; |
18 import org.chromium.content.common.ContentSwitches; | |
19 | 19 |
20 /** | 20 /** |
21 * Tests for the "Save Passwords" settings screen. | 21 * Tests for the "Save Passwords" settings screen. |
22 */ | 22 */ |
23 public class SavePasswordsPreferencesTest extends NativeLibraryTestBase { | 23 public class SavePasswordsPreferencesTest extends NativeLibraryTestBase { |
24 | 24 |
25 @Override | 25 @Override |
26 protected void setUp() throws Exception { | 26 protected void setUp() throws Exception { |
27 super.setUp(); | 27 super.setUp(); |
28 CommandLine.getInstance().appendSwitch(ContentSwitches.ENABLE_CREDENTIAL _MANAGER_API); | |
29 loadNativeLibraryAndInitBrowserProcess(); | 28 loadNativeLibraryAndInitBrowserProcess(); |
30 } | 29 } |
31 | 30 |
32 /** | 31 /** |
33 * Ensure that the on/off switch in "Save Passwords" settings actually enabl es and disables | 32 * Ensure that the on/off switch in "Save Passwords" settings actually enabl es and disables |
34 * password saving. | 33 * password saving. |
35 */ | 34 */ |
36 @SmallTest | 35 @SmallTest |
37 @Feature({"Preferences"}) | 36 @Feature({"Preferences"}) |
38 public void testSavePasswordsSwitch() throws Exception { | 37 public void testSavePasswordsSwitch() throws Exception { |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
79 SavePasswordsPreferences.PREF_SAVE_PASSWORDS_SWI TCH); | 78 SavePasswordsPreferences.PREF_SAVE_PASSWORDS_SWI TCH); |
80 assertFalse(onOffSwitch.isChecked()); | 79 assertFalse(onOffSwitch.isChecked()); |
81 } | 80 } |
82 }); | 81 }); |
83 } | 82 } |
84 | 83 |
85 /** | 84 /** |
86 * Ensure that the "Auto Sign-in" switch in "Save Passwords" settings actual ly enables and | 85 * Ensure that the "Auto Sign-in" switch in "Save Passwords" settings actual ly enables and |
87 * disables auto sign-in. | 86 * disables auto sign-in. |
88 */ | 87 */ |
88 @CommandLineFlags.Add({SafePasswordPreferences.ENABLE_CREDENTIAL_MANAGER_API }) | |
89 @SmallTest | 89 @SmallTest |
90 @Feature({"Preferences"}) | 90 @Feature({"Preferences"}) |
91 public void testAutoSignInCheckbox() throws Exception { | 91 public void testAutoSignInCheckbox() throws Exception { |
92 ThreadUtils.runOnUiThreadBlocking(new Runnable() { | 92 ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
93 @Override | 93 @Override |
94 public void run() { | 94 public void run() { |
95 PrefServiceBridge.getInstance().setPasswordManagerAutoSigninEnab led(true); | 95 PrefServiceBridge.getInstance().setPasswordManagerAutoSigninEnab led(true); |
96 } | 96 } |
97 }); | 97 }); |
98 | 98 |
99 final Preferences preferences = PreferencesTest.startPreferences( | 99 final Preferences preferences = PreferencesTest.startPreferences( |
100 getInstrumentation(), SavePasswordsPreferences.class.getName()); | 100 getInstrumentation(), SavePasswordsPreferences.class.getName()); |
101 | 101 |
102 ThreadUtils.runOnUiThreadBlocking(new Runnable() { | 102 ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
103 @Override | 103 @Override |
104 public void run() { | 104 public void run() { |
105 assertTrue(CommandLine.getInstance().hasSwitch( | 105 if (!ChromeFeatureList.isEnabled( |
Bernhard Bauer
2016/04/14 13:57:48
This shouldn't be necessary now. In fact, if for s
| |
106 ContentSwitches.ENABLE_CREDENTIAL_MANAGER_API)); | 106 SavePasswordsPreferences.ENABLE_CREDENTIAL_MANAGER_A PI)) { |
107 return; | |
108 } | |
107 SavePasswordsPreferences passwordPrefs = | 109 SavePasswordsPreferences passwordPrefs = |
108 (SavePasswordsPreferences) preferences.getFragmentForTes t(); | 110 (SavePasswordsPreferences) preferences.getFragmentForTes t(); |
109 ChromeBaseCheckBoxPreference onOffSwitch = | 111 ChromeBaseCheckBoxPreference onOffSwitch = |
110 (ChromeBaseCheckBoxPreference) passwordPrefs.findPrefere nce( | 112 (ChromeBaseCheckBoxPreference) passwordPrefs.findPrefere nce( |
111 SavePasswordsPreferences.PREF_AUTOSIGNIN_SWITCH) ; | 113 SavePasswordsPreferences.PREF_AUTOSIGNIN_SWITCH) ; |
112 assertTrue(onOffSwitch.isChecked()); | 114 assertTrue(onOffSwitch.isChecked()); |
113 | 115 |
114 PreferencesTest.clickPreference(passwordPrefs, onOffSwitch); | 116 PreferencesTest.clickPreference(passwordPrefs, onOffSwitch); |
115 assertFalse(PrefServiceBridge.getInstance().isPasswordManagerAut oSigninEnabled()); | 117 assertFalse(PrefServiceBridge.getInstance().isPasswordManagerAut oSigninEnabled()); |
116 PreferencesTest.clickPreference(passwordPrefs, onOffSwitch); | 118 PreferencesTest.clickPreference(passwordPrefs, onOffSwitch); |
117 assertTrue(PrefServiceBridge.getInstance().isPasswordManagerAuto SigninEnabled()); | 119 assertTrue(PrefServiceBridge.getInstance().isPasswordManagerAuto SigninEnabled()); |
118 | 120 |
119 preferences.finish(); | 121 preferences.finish(); |
120 | 122 |
121 PrefServiceBridge.getInstance().setPasswordManagerAutoSigninEnab led(false); | 123 PrefServiceBridge.getInstance().setPasswordManagerAutoSigninEnab led(false); |
122 } | 124 } |
123 }); | 125 }); |
124 | 126 |
125 final Preferences preferences2 = PreferencesTest.startPreferences( | 127 final Preferences preferences2 = PreferencesTest.startPreferences( |
126 getInstrumentation(), SavePasswordsPreferences.class.getName()); | 128 getInstrumentation(), SavePasswordsPreferences.class.getName()); |
127 ThreadUtils.runOnUiThreadBlocking(new Runnable() { | 129 ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
128 @Override | 130 @Override |
129 public void run() { | 131 public void run() { |
130 assertTrue(CommandLine.getInstance().hasSwitch( | 132 if (!ChromeFeatureList.isEnabled( |
131 ContentSwitches.ENABLE_CREDENTIAL_MANAGER_API)); | 133 SafePasswordPreferences.ENABLE_CREDENTIAL_MANAGER_AP I)) { |
134 return; | |
135 } | |
132 SavePasswordsPreferences passwordPrefs = | 136 SavePasswordsPreferences passwordPrefs = |
133 (SavePasswordsPreferences) preferences2.getFragmentForTe st(); | 137 (SavePasswordsPreferences) preferences2.getFragmentForTe st(); |
134 ChromeBaseCheckBoxPreference onOffSwitch = | 138 ChromeBaseCheckBoxPreference onOffSwitch = |
135 (ChromeBaseCheckBoxPreference) passwordPrefs.findPrefere nce( | 139 (ChromeBaseCheckBoxPreference) passwordPrefs.findPrefere nce( |
136 SavePasswordsPreferences.PREF_AUTOSIGNIN_SWITCH) ; | 140 SavePasswordsPreferences.PREF_AUTOSIGNIN_SWITCH) ; |
137 assertFalse(onOffSwitch.isChecked()); | 141 assertFalse(onOffSwitch.isChecked()); |
138 } | 142 } |
139 }); | 143 }); |
140 } | 144 } |
141 } | 145 } |
OLD | NEW |