Fixed a few Autofill automation failures and added new tests.

chrome/test/functional/autofill.py

 #!/usr/bin/python
 # Copyright (c) 2011 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 logging
 import os
 import pickle
 
 import autofill_dataset_converter
@@ skipping 72 matching lines @@
                        'ADDRESS_HOME_ZIP': 'my_zip',
                        'ADDRESS_HOME_COUNTRY': 'United States'}
     # Add some invalid fields.
     with_invalid = without_invalid.copy()
     with_invalid['PHONE_HOME_WHOLE_NUMBER'] = 'Invalid_Phone_Number'
     with_invalid['PHONE_FAX_WHOLE_NUMBER'] = 'Invalid_Fax_Number'
     self.FillAutofillProfile(profiles=[with_invalid])
     self.assertEqual([without_invalid],
                      self.GetAutofillProfile()['profiles'])
 
-  def testFilterIncompleteAddresses(self):
-    """Test Autofill filters out profile with incomplete address info."""
+  def testAutofillPrefsStringSavedAsIs(self):
+    """Test invalid credit card numbers typed in prefs should be saved as-is."""
+    credit_card = {'CREDIT_CARD_NUMBER': 'Not_0123-5Checked'}
+    self.FillAutofillProfile(credit_cards=[credit_card])
+    self.assertEqual([credit_card],
+                     self.GetAutofillProfile()['credit_cards'],
+                     msg='Credit card number in prefs not saved as-is.')
+
+  def _LuhnCreditCardNumberValidator(self, number):

[dennis_jeffrey, 2011/04/15 23:41:55]

Based on what I read online (http://www.merriampark.com/anatomycc.htm), it seems
we need to do the following to perform the Luhn test:

1) Reverse the digits.
2) Double the value of every digit that is in an even-numbered position
(1-based, so starting with the second digit).
3) For every doubled digit: if the value is greater than 9, subtract 9 from the
value.
4) Sum all resulting digit values in all positions.
5) If the sum is divisible by 10, the number is valid.  Otherwise, the number is
invalid.

If you agree with the steps above, could you revise the comments and
implementation in this function accordingly?

[dyu1, 2011/04/16 00:11:06]

Done.

+    """Validates whether a number is valid or invalid using the Luhn test.
+
+    Validation steps:
+      1. Reverse the order of the digits in the number.
+      2. Take the first, third, and every other odd digit and sum them up to
+      form sum s1.
+      3. Take the second, fourth, and every even digit, multiply each digit by
+      two and sum the digits if the answer is greater than nine.
+      4. Sum the partial sums of the even digits to form s2.
+      5. If s1 + s2 ends in zero then the number is valid.
+
+    Args:
+      number: the credit card number being validated as a string.

[Nirnimesh, 2011/04/15 22:15:46]

nit: put a , after validated

[dennis_jeffrey, 2011/04/15 22:51:19]

Clarify that this function assumes the string contains only digits (no spaces or
dashes).

[dyu1, 2011/04/16 00:11:06]

Done.

[dyu1, 2011/04/16 00:11:06]

I added a line to filter the numbers so it removed all non-digit characters.

+
+    Return:
+      boolean whether the credit card number is true or false.

[Nirnimesh, 2011/04/15 22:15:46]

s/is true or false/is valid or not/

[dyu1, 2011/04/16 00:11:06]

Done.

+    """
+    reverse = [int(ch) for ch in str(number)][::-1]
+    # The divmod of the function splits a number into two digits, ready for
+    # summing.
+    return ((sum(reverse[0::2]) + sum(sum(divmod(d*2, 10))
+                                      for d in reverse[1::2])) % 10 == 0)

[dennis_jeffrey, 2011/04/15 22:51:19]

As discussed offline, the implementation here might not quite match what we
expect is happening - we can investigate this a bit more offline.

[dyu1, 2011/04/16 00:11:06]

Done.

+
+  def testInvalidCreditCardNumberIsNotAggregated(self):
+    """Test credit card info with an invalid  number is not aggregated.

[dennis_jeffrey, 2011/04/15 22:51:19]

Delete 1 of the extra spaces within "invalid  number"

[dyu1, 2011/04/16 00:11:06]

Done.

+
+    When filling out a form with an invalid credit card  number (one that

[dennis_jeffrey, 2011/04/15 22:51:19]

Delete 1 of the extra spaces within "card  number"

[dyu1, 2011/04/16 00:11:06]

Done.

+    does not pass the Luhn test) the credit card info should not be saved into
+    Autofill preferences.
+    """
+    invalid_cc_info = {'CREDIT_CARD_NAME': 'Bob Smith',
+                       'CREDIT_CARD_NUMBER': '4408 0412 3456 7890',
+                       'CREDIT_CARD_EXP_MONTH': '12',
+                       'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2014'}
+
+    # Strip the white spaces from the number.
+    cc_number = invalid_cc_info['CREDIT_CARD_NUMBER'].replace(' ', '')
+    self.assertFalse(self._LuhnCreditCardNumberValidator(cc_number),
+                    msg='This test requires an invalid credit card number.')

[dennis_jeffrey, 2011/04/15 22:51:19]

Indent by 1 more space.

[dyu1, 2011/04/16 00:11:06]

Done.

+    url = self.GetHttpURLForDataPath(
+        os.path.join('autofill', 'autofill_creditcard_form.html'))
+    self.NavigateToURL(url)
+    for key, value in invalid_cc_info.iteritems():
+      script = ('document.getElementById("%s").value = "%s"; '
+                'window.domAutomationController.send("done");') % (key, value)
+      self.ExecuteJavascript(script, 0, 0)
+    js_code = """
+      document.getElementById("cc_submit").submit();
+      window.addEventListener("unload", function() {
+        window.domAutomationController.send("done");
+      });
+    """
+    self.ExecuteJavascript(js_code, 0, 0)
+    # Wait until the form is submitted and the page completes loading.
+    self.WaitUntil(
+        lambda: self.GetDOMValue('document.readyState'),
+        expect_retval='complete')
+    cc_infobar = self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars']
+    self.assertFalse(
+        cc_infobar, msg='Save credit card infobar offered to save CC info.')
+
+  def testWhitespacesAndSeparatorCharsStrippedForValidCCNums(self):
+    """Test whitespaces and separator chars are stripped for valid CC numbers.
+
+    The credit card number used in this test passes the Luhn test.

[dennis_jeffrey, 2011/04/15 22:51:19]

"number" --> "numbers"
"passes" --> "pass"

[dyu1, 2011/04/16 00:11:06]

Done.

+    For reference: http://www.merriampark.com/anatomycc.htm
+    """
+    credit_card_info = [{'CREDIT_CARD_NAME': 'Bob Smith',
+                         'CREDIT_CARD_NUMBER': '4408 0412 3456 7893',
+                         'CREDIT_CARD_EXP_MONTH': '12',
+                         'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2014'},
+                        {'CREDIT_CARD_NAME': 'Jane Doe',
+                         'CREDIT_CARD_NUMBER': '4417-1234-5678-9113',
+                         'CREDIT_CARD_EXP_MONTH': '10',
+                         'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2013'}]
+

[dennis_jeffrey, 2011/04/15 22:51:19]

(optional) In the previous test above, you assert that the credit card number
does not pass the Luhn test.  Should we assert here that the 2 credit card
numbers do pass the Luhn test?

[dyu1, 2011/04/16 00:11:06]

Done.

+    url = self.GetHttpURLForDataPath(
+        os.path.join('autofill', 'autofill_creditcard_form.html'))
+    for cc_info in credit_card_info:
+      self.NavigateToURL(url)
+      for key, value in cc_info.iteritems():
+        script = ('document.getElementById("%s").value = "%s"; '
+                  'window.domAutomationController.send("done");') % (key, value)
+        self.ExecuteJavascript(script, 0, 0)
+      js_code = """
+        document.getElementById("cc_submit").submit();
+        window.addEventListener("unload", function() {
+          window.domAutomationController.send("done");
+        });
+      """
+      self.ExecuteJavascript(js_code, 0, 0)
+      # Wait until form is submitted and page completes loading.
+      self.WaitUntil(
+          lambda: self.GetDOMValue('document.readyState'),
+          expect_retval='complete')
+      self.PerformActionOnInfobar('accept', infobar_index=0)
+
+    # Verify the filled in credit card number against the aggregated number.

[dennis_jeffrey, 2011/04/15 22:51:19]

"filled in" --> "filled-in"

[dyu1, 2011/04/16 00:11:06]

Done.

+    aggregated_cc_1 = (
+        self.GetAutofillProfile()['credit_cards'][0]['CREDIT_CARD_NUMBER'])
+    aggregated_cc_2 = (
+        self.GetAutofillProfile()['credit_cards'][1]['CREDIT_CARD_NUMBER'])
+    self.assertFalse((' ' in aggregated_cc_1 or ' ' in aggregated_cc_2 or '-' in

[dennis_jeffrey, 2011/04/15 22:51:19]

Recommend moving:

'-' in

to the next line.

[dyu1, 2011/04/16 00:11:06]

Done.

+                     aggregated_cc_1 or '-' in aggregated_cc_2),

[dennis_jeffrey, 2011/04/15 22:51:19]

Indent line by 1 more space.

[dyu1, 2011/04/16 00:11:06]

Done.

+                    msg='Whitespaces or separator chars not stripped.')

[dennis_jeffrey, 2011/04/15 22:51:19]

Indent line by 1 more space.

[dyu1, 2011/04/16 00:11:06]

Done.

+
+  def testProfilesNotAggregatedWithNoAddress(self):
+    """Test Autofill does not aggregate profiles with no address info."""
     profile = {'NAME_FIRST': 'Bob',
                'NAME_LAST': 'Smith',
                'EMAIL_ADDRESS': 'bsmith@example.com',
                'COMPANY_NAME': 'Company X',
                'PHONE_HOME_WHOLE_NUMBER': '650-123-4567',}
     url = self.GetHttpURLForDataPath(
         os.path.join('autofill', 'duplicate_profiles_test.html'))
     self.NavigateToURL(url)
     for key, value in profile.iteritems():
       script = ('document.getElementById("%s").value = "%s"; '
                 'window.domAutomationController.send("done");') % (key, value)
       self.ExecuteJavascript(script, 0, 0)
     js_code = """
       document.getElementById("merge_dup").submit();
       window.addEventListener("unload", function() {
         window.domAutomationController.send("done");
       });
     """
     self.ExecuteJavascript(js_code, 0, 0)
-    self.assertEqual([], self.GetAutofillProfile()['profiles'])
+    self.assertFalse(self.GetAutofillProfile()['profiles'],
+                     msg='Profile with no address info was aggregated.')
 
-  def testFilterMalformedEmailAddresses(self):
-    """Test Autofill filters out malformed email address during form submit."""
+  def testProfilesNotAggregatedWithInvalidEmail(self):
+    """Test Autofill does not aggregate profiles with an invalid email."""
     profile = {'NAME_FIRST': 'Bob',
                'NAME_LAST': 'Smith',
                'EMAIL_ADDRESS': 'garbage',
                'ADDRESS_HOME_LINE1': '1234 H St.',
                'ADDRESS_HOME_CITY': 'San Jose',
                'ADDRESS_HOME_STATE': 'CA',
                'ADDRESS_HOME_ZIP': '95110',
                'COMPANY_NAME': 'Company X',
                'PHONE_HOME_WHOLE_NUMBER': '408-123-4567',}
     url = self.GetHttpURLForDataPath(
         os.path.join('autofill', 'duplicate_profiles_test.html'))
     self.NavigateToURL(url)
     for key, value in profile.iteritems():
       script = ('document.getElementById("%s").value = "%s"; '
                 'window.domAutomationController.send("done");') % (key, value)
       self.ExecuteJavascript(script, 0, 0)
     js_code = """
       document.getElementById("merge_dup").submit();
       window.addEventListener("unload", function() {
         window.domAutomationController.send("done");
       });
     """
     self.ExecuteJavascript(js_code, 0, 0)
-    if 'EMAIL_ADDRESS' in self.GetAutofillProfile()['profiles'][0]:
-      raise KeyError('TEST FAIL: Malformed email address is saved in profiles.')
+    self.assertFalse(self.GetAutofillProfile()['profiles'],
+                     msg='Profile with invalid email was aggregated.')
 
   def _SendKeyEventsToPopulateForm(self, tab_index=0, windex=0):
     """Send key events to populate a web form with Autofill profile data.
 
     Args:
       tab_index: The tab index, default is 0.
       windex: The window index, default is 0.
     """
     TAB_KEYPRESS = 0x09  # Tab keyboard key press.
     DOWN_KEYPRESS = 0x28  # Down arrow keyboard key press.
@@ skipping 26 matching lines @@
       form_values = {}
       for key, value in profile_expected.iteritems():
         js_returning_field_value = (
             'var field_value = document.getElementById("%s").value;'
             'window.domAutomationController.send(field_value);'
             ) % key
         form_values[key] = self.ExecuteJavascript(
             js_returning_field_value, 0, 0)
         self.assertEqual(
             form_values[key], value,
-            ('Original profile not equal to expected profile at key: "%s"\n'
-             'Expected: "%s"\nReturned: "%s"' % (key, value, form_values[key])))
+            msg=('Original profile not equal to expected profile at key: "%s"\n'
+                 'Expected: "%s"\nReturned: "%s"' % (
+                     key, value, form_values[key])))
 
   def testCCInfoNotStoredWhenAutocompleteOff(self):
     """Test CC info not offered to be saved when autocomplete=off for CC field.
 
     If the credit card number field has autocomplete turned off, then the credit
     card infobar should not offer to save the credit card info. The credit card
     number must be a valid Luhn number.
     """
     credit_card_info = {'CREDIT_CARD_NAME': 'Bob Smith',
                         'CREDIT_CARD_NUMBER': '4408041234567893',
@@ skipping 12 matching lines @@
       window.addEventListener("unload", function() {
         window.domAutomationController.send("done");
       });
     """
     self.ExecuteJavascript(js_code, 0, 0)
     # Wait until form is submitted and page completes loading.
     self.WaitUntil(
         lambda: self.GetDOMValue('document.readyState'),
         expect_retval='complete')
     cc_infobar = self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars']
-    self.assertEqual(0, len(cc_infobar),
-                     'Save credit card infobar offered to save CC info.')
+    self.assertFalse(cc_infobar,
+                     msg='Save credit card infobar offered to save CC info.')
 
   def testNoAutofillForReadOnlyFields(self):
     """Test that Autofill does not fill in read-only fields."""
     profile = {'NAME_FIRST': 'Bob',
                'NAME_LAST': 'Smith',
                'EMAIL_ADDRESS': 'bsmith@gmail.com',
                'ADDRESS_HOME_LINE1': '1234 H St.',
                'ADDRESS_HOME_CITY': 'San Jose',
                'ADDRESS_HOME_STATE': 'CA',
                'ADDRESS_HOME_ZIP': '95110',
@@ skipping 120 matching lines @@
     merged_profile = os.path.join(self.DataDir(), 'autofill',
                                   'merged-profiles.txt')
     profile_dict = self.GetAutofillProfile()['profiles']
     output = open(merged_profile, 'wb')
     pickle.dump(profile_dict, output)
     output.close()
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()