Chromium Code Reviews| Index: functional/prefs.py |
| =================================================================== |
| --- functional/prefs.py (revision 110726) |
| +++ functional/prefs.py (working copy) |
| @@ -10,6 +10,7 @@ |
| import pyauto_functional # Must be imported before pyauto |
| import pyauto |
| +import test_utils |
| class PrefsTest(pyauto.PyUITest): |
| @@ -26,22 +27,35 @@ |
| def testSessionRestore(self): |
| """Test session restore preference.""" |
| + |
| + pref_url = 'chrome://settings/browser' |
| url1 = 'http://www.google.com/' |
|
kkania
2011/11/22 20:42:46
there's no reason to use public URLs for this test
vivianz
2011/11/22 22:29:43
make sense, but will leave as is this time, since
|
| url2 = 'http://news.google.com/' |
| + |
| + self.NavigateToURL(pref_url) |
| + # Set pref to restore session on startup. |
| + driver = self.NewWebDriver() |
| + restore = driver.find_element_by_xpath( |
|
kkania
2011/11/22 20:42:46
I think a good convention to start is appending '_
vivianz
2011/11/22 22:29:43
Done.
|
| + '//input[@metric="Options_Startup_LastSession"]') |
| + restore.click() |
| + self.assertTrue(restore.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.""" |