Fix for pyauto autofill test: testFillProfileCrazyCharacters

Recent changes to Autofill required some modifications to the input
data files for this pyauto test.  The test should now pass, and is
being re-enabled.

BUG=77969
TEST=None

Review URL: http://codereview.chromium.org/6952002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84629 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 9 insertions, 8 deletions

diff --git a/chrome/test/data/autofill/functional/crazy_autofill.txt b/chrome/test/data/autofill/functional/crazy_autofill.txt
index 5e645ed..bc0b91b 100644
--- a/chrome/test/data/autofill/functional/crazy_autofill.txt
+++ b/chrome/test/data/autofill/functional/crazy_autofill.txt
@@ -6,7 +6,7 @@
 # ascii.
 # Used by: chrome/test/functional/autofill.py
 [
- {u'NAME_FIRST': u'\u0623\u0648\u0628\u0627\u0645\u0627 \u064a\u0639\u062a\u0630\u0631 \u0647\u0627\u062a\u0641\u064a\u0627 \u0644\u0645\u0648\u0638\u0641\u0629 \u0633\u0648\u062f\u0627\u0621 \u0627\u0633\u062a\u0642\u0627\u0644\u062a \u0628\u0633\u0628\u0628 \u062a\u0635\u0631\u064a\u062d\u0627\u062a \u0645\u062c\u062a\u0632\u0623\u0629', u'NAME_MIDDLE': u'BANK\xdcBERF\xc4LLE', u'EMAIL_ADDRESS': u'\uacbd\uc81c \ub274\uc2a4 \ub354\ubcf4\uae30@google.com', u'ADDRESS_HOME_LINE1': u'\uad6d\uc815\uc6d0\xb7\uac80\ucc30, \ub178\ubb34\ud604\uc815\ubd80 \ub300\ubd81\uc811\ucd09 \ub2f4\ub2f9 \uc778\uc0ac\ub4e4 \uc870\uc0ac', u'ADDRESS_HOME_CITY': u'\u653f\u5e9c\u4e0d\u6392\u9664\u7acb\u6cd5\u898f\u7ba1\u5c0e\u904a', u'ADDRESS_HOME_ZIP': u'YOHO_54676', u'PHONE_HOME_WHOLE_NUMBER': u'861088828000', u'ADDRESS_HOME_COUNTRY': u'India', u'PHONE_FAX_WHOLE_NUMBER': u'861088828000',},
+ {u'NAME_FIRST': u'\u0623\u0648\u0628\u0627\u0645\u0627 \u064a\u0639\u062a\u0630\u0631 \u0647\u0627\u062a\u0641\u064a\u0627 \u0644\u0645\u0648\u0638\u0641\u0629 \u0633\u0648\u062f\u0627\u0621 \u0627\u0633\u062a\u0642\u0627\u0644\u062a \u0628\u0633\u0628\u0628 \u062a\u0635\u0631\u064a\u062d\u0627\u062a \u0645\u062c\u062a\u0632\u0623\u0629', u'NAME_MIDDLE': u'BANK\xdcBERF\xc4LLE', u'EMAIL_ADDRESS': u'\uacbd\uc81c \ub274\uc2a4 \ub354\ubcf4\uae30@google.com', u'ADDRESS_HOME_LINE1': u'\uad6d\uc815\uc6d0\xb7\uac80\ucc30, \ub178\ubb34\ud604\uc815\ubd80 \ub300\ubd81\uc811\ucd09 \ub2f4\ub2f9 \uc778\uc0ac\ub4e4 \uc870\uc0ac', u'ADDRESS_HOME_CITY': u'\u653f\u5e9c\u4e0d\u6392\u9664\u7acb\u6cd5\u898f\u7ba1\u5c0e\u904a', u'ADDRESS_HOME_ZIP': u'YOHO_54676', u'PHONE_HOME_WHOLE_NUMBER': u'861088828000', u'PHONE_HOME_COUNTRY_CODE': u'86', u'PHONE_HOME_CITY_CODE': u'108', u'ADDRESS_HOME_COUNTRY': u'India', u'PHONE_FAX_WHOLE_NUMBER': u'861088828000', u'PHONE_FAX_COUNTRY_CODE': u'86', u'PHONE_FAX_CITY_CODE': u'108',},
 
  {u'NAME_FIRST': u'\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a \u677e\u9690\u9547\u4ead\u67ab\u516c\u8def1915\u53f7','NAME_LAST': u'aguantó', u'ADDRESS_HOME_ZIP': u'HOME 94043',},
 
@@ -18,5 +18,5 @@
 
  {u'NAME_FIRST': u'\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a \u677e\u9690\u9547\u4ead\u67ab\u516c\u8def1915\u53f7','NAME_LAST': u'\u0646\u062c\u0627\u0645\u064a\u0646\u0627 \u062f\u0639\u0645\u0647\u0627 \u0644\u0644\u0631\u0626\u064a\u0633 \u0627\u0644\u0633\u0648\u062f\u0627\u0646\u064a \u0639\u0645\u0631 \u0627\u0644\u0628\u0634\u064a\u0631', u'ADDRESS_HOME_ZIP': u'HOME 94043',},
 
- {u'NAME_FIRST': u'&$%$$$ TESTO *&*&^&^& MOKO',u'NAME_MIDDLE': u'WOHOOOO$$$$$$$$****',u'EMAIL_ADDRESS': u'yuvu@example.com', u'ADDRESS_HOME_LINE1': u'34544, anderson ST.(120230)', u'ADDRESS_HOME_CITY': u'Sunnyvale', 'ADDRESS_HOME_STATE': u'CA', u'ADDRESS_HOME_ZIP': u'94086', u'PHONE_HOME_WHOLE_NUMBER': u'15466784565', u'ADDRESS_HOME_COUNTRY': u'United States', u'PHONE_FAX_WHOLE_NUMBER': u'6505674567',},
+ {u'NAME_FIRST': u'&$%$$$ TESTO *&*&^&^& MOKO',u'NAME_MIDDLE': u'WOHOOOO$$$$$$$$****',u'EMAIL_ADDRESS': u'yuvu@example.com', u'ADDRESS_HOME_LINE1': u'34544, anderson ST.(120230)', u'ADDRESS_HOME_CITY': u'Sunnyvale', 'ADDRESS_HOME_STATE': u'CA', u'ADDRESS_HOME_ZIP': u'94086', u'PHONE_HOME_WHOLE_NUMBER': u'15466784565', u'PHONE_HOME_COUNTRY_CODE': u'1', u'PHONE_HOME_CITY_CODE': u'546', u'ADDRESS_HOME_COUNTRY': u'United States', u'PHONE_FAX_WHOLE_NUMBER': u'6505674567', u'PHONE_FAX_CITY_CODE': u'650'},
 ]
diff --git a/chrome/test/data/autofill/functional/crazy_creditcards.txt b/chrome/test/data/autofill/functional/crazy_creditcards.txt
index c4ceb384..cc78d6a 100644
--- a/chrome/test/data/autofill/functional/crazy_creditcards.txt
+++ b/chrome/test/data/autofill/functional/crazy_creditcards.txt
@@ -16,8 +16,8 @@
 
   'expected': [
     {'CREDIT_CARD_NAME': u'\u751f\u6d3b\u5f88\u6709\u89c4\u5f8b \u4ee5\u73a9\u4e3a\u4e3b', 'CREDIT_CARD_NUMBER': '6011111111111117', 'CREDIT_CARD_EXP_MONTH': '12', 'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2011'},
-    {'CREDIT_CARD_NAME': 'John Williams', 'CREDIT_CARD_NUMBER': '12345', 'CREDIT_CARD_EXP_MONTH': '10', 'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2015'},
-    {'CREDIT_CARD_NAME': u'\u0623\u062d\u0645\u062f\u064a \u0646\u062c\u0627\u062f \u0644\u0645\u062d\u0627\u0648\u0644\u0647 \u0627\u063a\u062a\u064a\u0627\u0644 \u0641\u064a \u0645\u062f\u064a\u0646\u0629 \u0647\u0645\u062f\u0627\u0646 ', 'CREDIT_CARD_EXP_MONTH': '10', 'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2015'},
+    {'CREDIT_CARD_NAME': 'John Williams', 'CREDIT_CARD_NUMBER': 'WokoAwesome12345', 'CREDIT_CARD_EXP_MONTH': '10', 'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2015'},
+    {'CREDIT_CARD_NAME': u'\u0623\u062d\u0645\u062f\u064a \u0646\u062c\u0627\u062f \u0644\u0645\u062d\u0627\u0648\u0644\u0647 \u0627\u063a\u062a\u064a\u0627\u0644 \u0641\u064a \u0645\u062f\u064a\u0646\u0629 \u0647\u0645\u062f\u0627\u0646 ', 'CREDIT_CARD_NUMBER':u'\u092a\u0941\u0928\u0930\u094d\u091c\u0940\u0935\u093f\u0924 \u0939\u094b\u0917\u093e \u0928\u093e\u0932\u0902\u0926\u093e', 'CREDIT_CARD_EXP_MONTH': '10', 'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2015'},
     {'CREDIT_CARD_NAME': u'\u039d\u03ad\u03b5\u03c2 \u03c3\u03c5\u03b3\u03c7\u03c9\u03bd\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03ba\u03b1\u03c4\u03b1\u03c1\u03b3\u03ae\u03c3\u03b5\u03b9\u03c2', 'CREDIT_CARD_NUMBER':'00000000000000000000000', 'CREDIT_CARD_EXP_MONTH': '01', 'CREDIT_CARD_EXP_4_DIGIT_YEAR': '2016'},
   ],
 }
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index b5cdf7e..41353b9 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -29,8 +29,6 @@
     'all': [
       'autofill',
       '-autofill.AutofillTest.testComparePhoneNumbers',
-      # crbug.com/77969
-      '-autofill.AutofillTest.testFillProfileCrazyCharacters',
       '-autofill.AutofillTest.testNoAutofillForReadOnlyFields',
       # crbug.com/77113 - M13 feature.
       '-autofill.AutofillTest.testProfileWithEmailInOtherFieldNotSaved',
diff --git a/chrome/test/functional/autofill.py b/chrome/test/functional/autofill.py
index 2a62325..59f27d0 100644
--- a/chrome/test/functional/autofill.py
+++ b/chrome/test/functional/autofill.py
@@ -59,7 +59,8 @@ class AutofillTest(pyauto.PyUITest):
     profiles = self.EvalDataFrom(file_path)
     self.FillAutofillProfile(profiles=profiles)
 
-    self.assertEqual(profiles, self.GetAutofillProfile()['profiles'])
+    self.assertEqual(profiles, self.GetAutofillProfile()['profiles'],
+                     msg='Autofill profile data does not match.')
 
     # Adding credit cards.
     file_path = os.path.join(self.DataDir(), 'autofill', 'functional',
@@ -67,8 +68,10 @@ class AutofillTest(pyauto.PyUITest):
     test_data = self.EvalDataFrom(file_path)
     credit_cards_input = test_data['input']
     self.FillAutofillProfile(credit_cards=credit_cards_input)
+
     self.assertEqual(test_data['expected'],
-                     self.GetAutofillProfile()['credit_cards'])
+                     self.GetAutofillProfile()['credit_cards'],
+                     msg='Autofill credit card data does not match.')
 
   def testGetProfilesEmpty(self):
     """Test getting profiles when none have been filled."""