Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

Side by Side Diff: chrome/test/functional/prefs.py

Issue 6793045: Change text of DNS prefetch option to Network prediction option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix id on HTML page Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import logging 6 import logging
7 import os 7 import os
8 import shutil 8 import shutil
9 import sys 9 import sys
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 shutil.rmtree(new_dl_dir, ignore_errors=True) # cleanup 107 shutil.rmtree(new_dl_dir, ignore_errors=True) # cleanup
108 108
109 def testToolbarButtonsPref(self): 109 def testToolbarButtonsPref(self):
110 """Verify toolbar buttons prefs.""" 110 """Verify toolbar buttons prefs."""
111 # Assert defaults first 111 # Assert defaults first
112 self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton)) 112 self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
113 self.SetPrefs(pyauto.kShowHomeButton, True) 113 self.SetPrefs(pyauto.kShowHomeButton, True)
114 self.RestartBrowser(clear_profile=False) 114 self.RestartBrowser(clear_profile=False)
115 self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton)) 115 self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
116 116
117 def testDnsPrefetchingEnabledPref(self): 117 def testNetworkPredictionEnabledPref(self):
118 """Verify DNS prefetching pref.""" 118 """Verify DNS prefetching pref."""
119 # Assert default 119 # Assert default
120 self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kDnsPrefetchingEnabled)) 120 self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kNetworkPredictionEnabled))
121 self.SetPrefs(pyauto.kDnsPrefetchingEnabled, False) 121 self.SetPrefs(pyauto.kNetworkPredictionEnabled, False)
122 self.RestartBrowser(clear_profile=False) 122 self.RestartBrowser(clear_profile=False)
123 self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kDnsPrefetchingEnabled)) 123 self.assertFalse(self.GetPrefsInfo().Prefs(
124 pyauto.kNetworkPredictionEnabled))
124 125
125 def testHomepagePrefs(self): 126 def testHomepagePrefs(self):
126 """Verify homepage prefs.""" 127 """Verify homepage prefs."""
127 # "Use the New Tab page" 128 # "Use the New Tab page"
128 self.SetPrefs(pyauto.kHomePageIsNewTabPage, True) 129 self.SetPrefs(pyauto.kHomePageIsNewTabPage, True)
129 logging.debug('Setting %s to 1' % pyauto.kHomePageIsNewTabPage) 130 logging.debug('Setting %s to 1' % pyauto.kHomePageIsNewTabPage)
130 self.RestartBrowser(clear_profile=False) 131 self.RestartBrowser(clear_profile=False)
131 self.assertEqual(self.GetPrefsInfo().Prefs(pyauto.kHomePageIsNewTabPage), 132 self.assertEqual(self.GetPrefsInfo().Prefs(pyauto.kHomePageIsNewTabPage),
132 True) 133 True)
133 # "Open this page" 134 # "Open this page"
(...skipping 22 matching lines...) Expand all
156 self.SetPrefs(pyauto.kGeolocationDefaultContentSetting, 2) 157 self.SetPrefs(pyauto.kGeolocationDefaultContentSetting, 2)
157 self.assertEqual(2, 158 self.assertEqual(2,
158 self.GetPrefsInfo().Prefs(pyauto.kGeolocationDefaultContentSetting)) 159 self.GetPrefsInfo().Prefs(pyauto.kGeolocationDefaultContentSetting))
159 self.GetBrowserWindow(0).GetTab(0).Reload() 160 self.GetBrowserWindow(0).GetTab(0).Reload()
160 self.assertTrue(self.WaitForInfobarCount(0)) 161 self.assertTrue(self.WaitForInfobarCount(0))
161 self.assertFalse(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars']) 162 self.assertFalse(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
162 163
163 def testUnderTheHoodPref(self): 164 def testUnderTheHoodPref(self):
164 """Verify the security preferences for Under the Hood. 165 """Verify the security preferences for Under the Hood.
165 The setting is enabled by default.""" 166 The setting is enabled by default."""
166 pref_list = [pyauto.kDnsPrefetchingEnabled, pyauto.kSafeBrowsingEnabled, 167 pref_list = [pyauto.kNetworkPredictionEnabled, pyauto.kSafeBrowsingEnabled,
167 pyauto.kAlternateErrorPagesEnabled, 168 pyauto.kAlternateErrorPagesEnabled,
168 pyauto.kSearchSuggestEnabled, pyauto.kShowOmniboxSearchHint] 169 pyauto.kSearchSuggestEnabled, pyauto.kShowOmniboxSearchHint]
169 for pref in pref_list: 170 for pref in pref_list:
170 # Verify the default value 171 # Verify the default value
171 self.assertEqual(self.GetPrefsInfo().Prefs(pref), True) 172 self.assertEqual(self.GetPrefsInfo().Prefs(pref), True)
172 self.SetPrefs(pref, False) 173 self.SetPrefs(pref, False)
173 self.RestartBrowser(clear_profile=False) 174 self.RestartBrowser(clear_profile=False)
174 for pref in pref_list: 175 for pref in pref_list:
175 self.assertEqual(self.GetPrefsInfo().Prefs(pref), False) 176 self.assertEqual(self.GetPrefsInfo().Prefs(pref), False)
176 177
177 def testJavaScriptEnableDisable(self): 178 def testJavaScriptEnableDisable(self):
178 """Verify enabling disabling javascript prefs work """ 179 """Verify enabling disabling javascript prefs work """
179 180
180 self.assertTrue( 181 self.assertTrue(
181 self.GetPrefsInfo().Prefs('webkit.webprefs.javascript_enabled')) 182 self.GetPrefsInfo().Prefs('webkit.webprefs.javascript_enabled'))
182 url = self.GetFileURLForDataPath( 183 url = self.GetFileURLForDataPath(
183 os.path.join('javaScriptTitle.html')) 184 os.path.join('javaScriptTitle.html'))
184 title1 = 'Title from script javascript enabled' 185 title1 = 'Title from script javascript enabled'
185 self.NavigateToURL(url) 186 self.NavigateToURL(url)
186 self.assertEqual(title1, self.GetActiveTabTitle()) 187 self.assertEqual(title1, self.GetActiveTabTitle())
187 self.SetPrefs('webkit.webprefs.javascript_enabled', False) 188 self.SetPrefs('webkit.webprefs.javascript_enabled', False)
188 title = 'This is html title' 189 title = 'This is html title'
189 self.NavigateToURL(url) 190 self.NavigateToURL(url)
190 self.assertEqual(title, self.GetActiveTabTitle()) 191 self.assertEqual(title, self.GetActiveTabTitle())
191 192
192 if __name__ == '__main__': 193 if __name__ == '__main__':
193 pyauto_functional.Main() 194 pyauto_functional.Main()
194 195
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698