Refactor tests that performs an action on the password infobar to identify the infobar by type and …

chrome/test/functional/passwords.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 import test_utils
 
 
 class PasswordTest(pyauto.PyUITest):
   """Tests that passwords work correctly."""
 
-  INFOBAR_BUTTON_TEXT = 'Save password'
+  INFOBAR_TYPE = 'password_infobar'
 
   def Debug(self):
     """Test method for experimentation.
 
     This method will not run automatically.
     """
     while True:
       raw_input('Interact with the browser and hit <enter> to dump passwords. ')
       print '*' * 20
       self.pprint(self.GetSavedPasswords())
@@ skipping 47 matching lines @@
       if (element)
         value = element.value;
       window.domAutomationController.send(value);
     """
     self.assertTrue(self.WaitUntil(
         lambda: self.ExecuteJavascript(js_template % 'Email',
                                       tab_index, window_index) != '' and
                 self.ExecuteJavascript(js_template % 'Passwd',
                                       tab_index, window_index) != ''))
 
-  def _InfobarButtonContainsText(self, search_text, windex, tab_index):
-    """Identifies whether an infobar button exists with the specified text.
+  def _GetInfobarIndexByType(self, infobar_type, windex, tab_index):
+    """Returns the index of the infobar of the given type.
 
     Args:
-      search_text: The text to search for on the infobar buttons.
+      infobar_type: The infobar type to look for.
       windex: Window index.
       tab_index: Tab index.
 
     Returns:
-      True, if search_text is found in the buttons, or False otherwise.
+      Index of infobar for infobar type, or None if not found.
     """
-    infobar = (
+    infobar_list = (
         self.GetBrowserInfo()['windows'][windex]['tabs'][tab_index] \
             ['infobars'])
-    for infobar_info in infobar:
-      if search_text in infobar_info['buttons']:
-        return True
-    return False
+    for infobar in infobar_list:
+      if infobar_type == infobar['type']:
+        return infobar_list.index(infobar)
+    return None
 
-  def _WaitForSavePasswordInfobar(self, windex=0, tab_index=0):
-    """Wait for and asserts that the save password infobar appears.
+  def _GetIndexForSavePasswordInfobar(self, windex=0, tab_index=0):
+    """Waits for save password infobar to appear and returns its index.
 
     Args:
       windex: Window index. Defaults to 0 (first window).
       tab_index: Tab index. Defaults to 0 (first tab).
+
+    Returns:
+      Index of infobar for infobar type.
     """
     self.assertTrue(
-        self.WaitUntil(lambda: self._InfobarButtonContainsText(
-            self.INFOBAR_BUTTON_TEXT, windex, tab_index)),
+        self.WaitUntil(lambda: self._GetInfobarIndexByType(
+            self.INFOBAR_TYPE, windex, tab_index)),
         msg='Save password infobar did not appear.')
+    # Return the infobar index.
+    # TODO(dyu): Use the return value in future tests.
+    return self._GetInfobarIndexByType(
+        self.INFOBAR_TYPE, windex, tab_index)
 
   def testSavePassword(self):
     """Test saving a password and getting saved passwords."""
     password1 = self._ConstructPasswordDictionary(
         'user@example.com', 'test.password',
         'https://www.example.com/', 'https://www.example.com/login',
         'username', 'password', 'https://www.example.com/login/')
     self.assertTrue(self.AddSavedPassword(password1))
     self.assertEqual(self.GetSavedPasswords(), [password1])
 
@@ skipping 25 matching lines @@
     url_https = 'https://www.google.com/accounts/Login'
     url_logout = 'https://www.google.com/accounts/Logout'
     creds = self.GetPrivateInfo()['test_google_account']
     username = creds['username']
     password = creds['password']
     test_utils.GoogleAccountsLogin(self, username, password)
     # Wait until page completes loading.
     self.WaitUntil(
         lambda: self.GetDOMValue('document.readyState'),
         expect_retval='complete')
-    self._WaitForSavePasswordInfobar()
+    self._GetIndexForSavePasswordInfobar()
     infobar = self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars']
-    self.assertEqual(infobar[0]['type'], 'confirm_infobar')
+    self.assertEqual(infobar[0]['type'], 'password_infobar')
     self.PerformActionOnInfobar('accept', infobar_index=0)
     self.NavigateToURL(url_logout)
     self.NavigateToURL(url_https)
     self._ClickOnLoginPage(0, 0)
     test_utils.VerifyGoogleAccountCredsFilled(self, username, password,
                                               tab_index=0, windex=0)
     test_utils.ClearPasswords(self)
 
   def testNeverSavePasswords(self):
     """Verify passwords not saved/deleted when 'never for this site' chosen."""
     creds1 = self.GetPrivateInfo()['test_google_account']
     test_utils.GoogleAccountsLogin(
         self, creds1['username'], creds1['password'])
-    self._WaitForSavePasswordInfobar()
+    self._GetIndexForSavePasswordInfobar()
     self.PerformActionOnInfobar('accept', infobar_index=0)
     self.assertEquals(1, len(self.GetSavedPasswords()))
     self.AppendTab(pyauto.GURL(creds1['logout_url']))
     creds2 = self.GetPrivateInfo()['test_google_account_2']
     test_utils.GoogleAccountsLogin(
         self, creds2['username'], creds2['password'], tab_index=1)
-    self._WaitForSavePasswordInfobar(tab_index=1)
+    self._GetIndexForSavePasswordInfobar(tab_index=1)
     # Selecting 'Never for this site' option on password infobar.
     self.PerformActionOnInfobar('cancel', infobar_index=0, tab_index=1)
 
     # TODO: GetSavedPasswords() doesn't return anything when empty.
     # http://crbug.com/64603
     # self.assertFalse(self.GetSavedPasswords())
     # TODO: Check the exceptions list
 
   def testSavedPasswordInTabsAndWindows(self):
     """Verify saved username/password shows in regular/incognito Window, NTP"""
     url = 'https://www.google.com/accounts/ServiceLogin'
     url_logout = 'https://www.google.com/accounts/Logout'
     creds = self.GetPrivateInfo()['test_google_account']
     username = creds['username']
     password = creds['password']
     # Login to Google a/c
     test_utils.GoogleAccountsLogin(self, username, password)
-    self._WaitForSavePasswordInfobar()
+    self._GetIndexForSavePasswordInfobar()
     self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
     self.PerformActionOnInfobar('accept', infobar_index=0)
     self.NavigateToURL(url_logout)
     self.NavigateToURL(url)
     self._ClickOnLoginPage(0, 0)
     test_utils.VerifyGoogleAccountCredsFilled(self, username, password,
         tab_index=0, windex=0)
     self.AppendTab(pyauto.GURL(url))
     self._ClickOnLoginPage(0, 1)
     test_utils.VerifyGoogleAccountCredsFilled(self, username, password,
         tab_index=1, windex=0)
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.NavigateToURL(url, 1, 0)
     self._ClickOnLoginPage(1, 0)
     test_utils.VerifyGoogleAccountCredsFilled(self, username, password,
         tab_index=0, windex=1)
     test_utils.ClearPasswords(self)
 
   def testInfoBarDisappearByNavigatingPage(self):
     """Test password infobar is dismissed when navigating to different page."""
     creds = self.GetPrivateInfo()['test_google_account']
     # Login to Google a/c
     test_utils.GoogleAccountsLogin(self, creds['username'], creds['password'])
-    self._WaitForSavePasswordInfobar()
+    self._GetIndexForSavePasswordInfobar()
     self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
     self.NavigateToURL('chrome://history')
     self.assertTrue(self.WaitForInfobarCount(0))
     # To make sure user is navigated to History page.
     self.assertEqual('History', self.GetActiveTabTitle())
     self.assertFalse(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
 
   def testInfoBarDisappearByReload(self):
     """Test that Password infobar disappears by the page reload."""
     creds = self.GetPrivateInfo()['test_google_account']
     # Login to Google a/c
     test_utils.GoogleAccountsLogin(self, creds['username'], creds['password'])
-    self._WaitForSavePasswordInfobar()
+    self._GetIndexForSavePasswordInfobar()
     self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
     self.GetBrowserWindow(0).GetTab(0).Reload()
     self.assertTrue(self.WaitForInfobarCount(0))
     self.assertFalse(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
 
   def testPasswdInfoNotStoredWhenAutocompleteOff(self):
     """Verify that password infobar does not appear when autocomplete is off.
 
     If the password field has autocomplete turned off, then the password infobar
     should not offer to save the password info.
@@ skipping 36 matching lines @@
     This test requires sending key events rather than pasting a new username
     into the Email field.
     """
     url = 'https://www.google.com/accounts/ServiceLogin'
     url_logout = 'https://www.google.com/accounts/Logout'
     creds = self.GetPrivateInfo()['test_google_account']
     username = creds['username']
     password = creds['password']
     # Login to Google a/c
     test_utils.GoogleAccountsLogin(self, username, password)
-    self._WaitForSavePasswordInfobar()
+    self._GetIndexForSavePasswordInfobar()
     self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
     self.PerformActionOnInfobar('accept', infobar_index=0)
     self.NavigateToURL(url_logout)
     self.NavigateToURL(url)
     self._ClickOnLoginPage(0, 0)
     test_utils.VerifyGoogleAccountCredsFilled(self, username, password,
         tab_index=0, windex=0)
     clear_username_field = (
         'document.getElementById("Email").value = ""; '
         'window.domAutomationController.send("done");')
     set_focus = (
         'document.getElementById("Email").focus(); '
         'window.domAutomationController.send("done");')
     self.ExecuteJavascript(clear_username_field, 0, 0)
     self.ExecuteJavascript(set_focus, 0, 0)
     self._SendCharToPopulateField('t', tab_index=0, windex=0)
     passwd_value = self.GetDOMValue('document.getElementById("Passwd").value')
     self.assertFalse(passwd_value,
                      msg='Password field not empty for new username.')
     test_utils.ClearPasswords(self)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()