summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional
diff options
context:
space:
mode:
authorvivianz@chromium.org <vivianz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 02:38:58 +0000
committervivianz@chromium.org <vivianz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 02:38:58 +0000
commit3a2033aa367453aa8b525113bb25cc1cf62ef9ba (patch)
tree2885571c44c2babe236e552fb6ca4bb8287f36bf /chrome/test/functional
parent3def0924640fc1e3c757ad5d3ab2f9c48a880eba (diff)
downloadchromium_src-3a2033aa367453aa8b525113bb25cc1cf62ef9ba.zip
chromium_src-3a2033aa367453aa8b525113bb25cc1cf62ef9ba.tar.gz
chromium_src-3a2033aa367453aa8b525113bb25cc1cf62ef9ba.tar.bz2
Modify session restore test to set restore setting via UI and verify UI settings using web driver.
Review URL: http://codereview.chromium.org/8601009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional')
-rw-r--r--chrome/test/functional/prefs.py22
1 files changed, 18 insertions, 4 deletions
diff --git a/chrome/test/functional/prefs.py b/chrome/test/functional/prefs.py
index bded6db..ca74bd2 100644
--- a/chrome/test/functional/prefs.py
+++ b/chrome/test/functional/prefs.py
@@ -10,6 +10,7 @@ import sys
import pyauto_functional # Must be imported before pyauto
import pyauto
+import test_utils
class PrefsTest(pyauto.PyUITest):
@@ -26,22 +27,35 @@ class PrefsTest(pyauto.PyUITest):
def testSessionRestore(self):
"""Test session restore preference."""
+
+ pref_url = 'chrome://settings/browser'
url1 = 'http://www.google.com/'
url2 = 'http://news.google.com/'
+
+ self.NavigateToURL(pref_url)
+ # Set pref to restore session on startup.
+ driver = self.NewWebDriver()
+ restore_elem = driver.find_element_by_xpath(
+ '//input[@metric="Options_Startup_LastSession"]')
+ restore_elem.click()
+ self.assertTrue(restore_elem.is_selected())
+ self.RestartBrowser(clear_profile=False)
self.NavigateToURL(url1)
self.AppendTab(pyauto.GURL(url2))
num_tabs = self.GetTabCount()
- # Set pref to restore session on startup
- self.SetPrefs(pyauto.kRestoreOnStartup, 1)
- logging.debug('Setting %s to 1' % pyauto.kRestoreOnStartup)
self.RestartBrowser(clear_profile=False)
- # Verify
+ # Verify tabs are properly restored.
self.assertEqual(self.GetPrefsInfo().Prefs(pyauto.kRestoreOnStartup), 1)
self.assertEqual(num_tabs, self.GetTabCount())
self.ActivateTab(0)
self.assertEqual(url1, self.GetActiveTabURL().spec())
self.ActivateTab(1)
self.assertEqual(url2, self.GetActiveTabURL().spec())
+ # Verify session restore option is still selected.
+ self.NavigateToURL(pref_url, 0, 0)
+ driver = self.NewWebDriver()
+ self.assertTrue(driver.find_element_by_xpath(
+ '//input[@metric="Options_Startup_LastSession"]').is_selected())
def testNavigationStateOnSessionRestore(self):
"""Verify navigation state is preserved on session restore."""