| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/ref_counted.h" | 7 #include "base/ref_counted.h" |
| 8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
| 9 #include "base/scoped_vector.h" | 9 #include "base/scoped_vector.h" |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| (...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 946 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[14])); | 946 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[14])); |
| 947 } | 947 } |
| 948 | 948 |
| 949 TEST_F(AutoFillManagerTest, FillPhoneNumber) { | 949 TEST_F(AutoFillManagerTest, FillPhoneNumber) { |
| 950 FormData form; | 950 FormData form; |
| 951 | 951 |
| 952 form.name = ASCIIToUTF16("MyPhoneForm"); | 952 form.name = ASCIIToUTF16("MyPhoneForm"); |
| 953 form.method = ASCIIToUTF16("POST"); | 953 form.method = ASCIIToUTF16("POST"); |
| 954 form.origin = GURL("http://myform.com/phone_form.html"); | 954 form.origin = GURL("http://myform.com/phone_form.html"); |
| 955 form.action = GURL("http://myform.com/phone_submit.html"); | 955 form.action = GURL("http://myform.com/phone_submit.html"); |
| 956 form.user_submitted = true; |
| 956 | 957 |
| 957 webkit_glue::FormField field; | 958 webkit_glue::FormField field; |
| 958 | 959 |
| 959 autofill_unittest::CreateTestFormField( | 960 autofill_unittest::CreateTestFormField( |
| 960 "country code", "country code", "", "text", &field); | 961 "country code", "country code", "", "text", &field); |
| 961 field.set_size(1); | 962 field.set_size(1); |
| 962 form.fields.push_back(field); | 963 form.fields.push_back(field); |
| 963 autofill_unittest::CreateTestFormField( | 964 autofill_unittest::CreateTestFormField( |
| 964 "area code", "area code", "", "text", &field); | 965 "area code", "area code", "", "text", &field); |
| 965 field.set_size(3); | 966 field.set_size(3); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 | 1018 |
| 1018 work_profile->SetInfo(phone_type, saved_phone); | 1019 work_profile->SetInfo(phone_type, saved_phone); |
| 1019 } | 1020 } |
| 1020 | 1021 |
| 1021 TEST_F(AutoFillManagerTest, FormChangesRemoveField) { | 1022 TEST_F(AutoFillManagerTest, FormChangesRemoveField) { |
| 1022 FormData form; | 1023 FormData form; |
| 1023 form.name = ASCIIToUTF16("MyForm"); | 1024 form.name = ASCIIToUTF16("MyForm"); |
| 1024 form.method = ASCIIToUTF16("POST"); | 1025 form.method = ASCIIToUTF16("POST"); |
| 1025 form.origin = GURL("http://myform.com/form.html"); | 1026 form.origin = GURL("http://myform.com/form.html"); |
| 1026 form.action = GURL("http://myform.com/submit.html"); | 1027 form.action = GURL("http://myform.com/submit.html"); |
| 1028 form.user_submitted = true; |
| 1027 | 1029 |
| 1028 webkit_glue::FormField field; | 1030 webkit_glue::FormField field; |
| 1029 autofill_unittest::CreateTestFormField( | 1031 autofill_unittest::CreateTestFormField( |
| 1030 "First Name", "firstname", "", "text", &field); | 1032 "First Name", "firstname", "", "text", &field); |
| 1031 form.fields.push_back(field); | 1033 form.fields.push_back(field); |
| 1032 autofill_unittest::CreateTestFormField( | 1034 autofill_unittest::CreateTestFormField( |
| 1033 "Middle Name", "middlename", "", "text", &field); | 1035 "Middle Name", "middlename", "", "text", &field); |
| 1034 form.fields.push_back(field); | 1036 form.fields.push_back(field); |
| 1035 autofill_unittest::CreateTestFormField( | 1037 autofill_unittest::CreateTestFormField( |
| 1036 "Last Name", "lastname", "", "text", &field); | 1038 "Last Name", "lastname", "", "text", &field); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 1060 ASCIIToUTF16("Home"), | 1062 ASCIIToUTF16("Home"), |
| 1061 1)); | 1063 1)); |
| 1062 | 1064 |
| 1063 int page_id = 0; | 1065 int page_id = 0; |
| 1064 FormData results; | 1066 FormData results; |
| 1065 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); | 1067 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); |
| 1066 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); | 1068 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); |
| 1067 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); | 1069 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); |
| 1068 EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin); | 1070 EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin); |
| 1069 EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action); | 1071 EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action); |
| 1072 EXPECT_TRUE(results.user_submitted); |
| 1070 ASSERT_EQ(4U, results.fields.size()); | 1073 ASSERT_EQ(4U, results.fields.size()); |
| 1071 | 1074 |
| 1072 autofill_unittest::CreateTestFormField( | 1075 autofill_unittest::CreateTestFormField( |
| 1073 "First Name", "firstname", "Elvis", "text", &field); | 1076 "First Name", "firstname", "Elvis", "text", &field); |
| 1074 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); | 1077 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); |
| 1075 autofill_unittest::CreateTestFormField( | 1078 autofill_unittest::CreateTestFormField( |
| 1076 "Middle Name", "middlename", "Aaron", "text", &field); | 1079 "Middle Name", "middlename", "Aaron", "text", &field); |
| 1077 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); | 1080 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); |
| 1078 autofill_unittest::CreateTestFormField( | 1081 autofill_unittest::CreateTestFormField( |
| 1079 "Last Name", "lastname", "Presley", "text", &field); | 1082 "Last Name", "lastname", "Presley", "text", &field); |
| 1080 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2])); | 1083 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2])); |
| 1081 autofill_unittest::CreateTestFormField( | 1084 autofill_unittest::CreateTestFormField( |
| 1082 "Email", "email", "theking@gmail.com", "text", &field); | 1085 "Email", "email", "theking@gmail.com", "text", &field); |
| 1083 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3])); | 1086 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3])); |
| 1084 } | 1087 } |
| 1085 | 1088 |
| 1086 TEST_F(AutoFillManagerTest, FormChangesAddField) { | 1089 TEST_F(AutoFillManagerTest, FormChangesAddField) { |
| 1087 FormData form; | 1090 FormData form; |
| 1088 form.name = ASCIIToUTF16("MyForm"); | 1091 form.name = ASCIIToUTF16("MyForm"); |
| 1089 form.method = ASCIIToUTF16("POST"); | 1092 form.method = ASCIIToUTF16("POST"); |
| 1090 form.origin = GURL("http://myform.com/form.html"); | 1093 form.origin = GURL("http://myform.com/form.html"); |
| 1091 form.action = GURL("http://myform.com/submit.html"); | 1094 form.action = GURL("http://myform.com/submit.html"); |
| 1095 form.user_submitted = true; |
| 1092 | 1096 |
| 1093 webkit_glue::FormField field; | 1097 webkit_glue::FormField field; |
| 1094 autofill_unittest::CreateTestFormField( | 1098 autofill_unittest::CreateTestFormField( |
| 1095 "First Name", "firstname", "", "text", &field); | 1099 "First Name", "firstname", "", "text", &field); |
| 1096 form.fields.push_back(field); | 1100 form.fields.push_back(field); |
| 1097 autofill_unittest::CreateTestFormField( | 1101 autofill_unittest::CreateTestFormField( |
| 1098 "Middle Name", "middlename", "", "text", &field); | 1102 "Middle Name", "middlename", "", "text", &field); |
| 1099 form.fields.push_back(field); | 1103 form.fields.push_back(field); |
| 1100 autofill_unittest::CreateTestFormField( | 1104 autofill_unittest::CreateTestFormField( |
| 1101 "Last Name", "lastname", "", "text", &field); | 1105 "Last Name", "lastname", "", "text", &field); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 1125 ASCIIToUTF16("Home"), | 1129 ASCIIToUTF16("Home"), |
| 1126 1)); | 1130 1)); |
| 1127 | 1131 |
| 1128 int page_id = 0; | 1132 int page_id = 0; |
| 1129 FormData results; | 1133 FormData results; |
| 1130 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); | 1134 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); |
| 1131 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); | 1135 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); |
| 1132 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); | 1136 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); |
| 1133 EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin); | 1137 EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin); |
| 1134 EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action); | 1138 EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action); |
| 1139 EXPECT_TRUE(results.user_submitted); |
| 1135 ASSERT_EQ(5U, results.fields.size()); | 1140 ASSERT_EQ(5U, results.fields.size()); |
| 1136 | 1141 |
| 1137 autofill_unittest::CreateTestFormField( | 1142 autofill_unittest::CreateTestFormField( |
| 1138 "First Name", "firstname", "Elvis", "text", &field); | 1143 "First Name", "firstname", "Elvis", "text", &field); |
| 1139 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); | 1144 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); |
| 1140 autofill_unittest::CreateTestFormField( | 1145 autofill_unittest::CreateTestFormField( |
| 1141 "Middle Name", "middlename", "Aaron", "text", &field); | 1146 "Middle Name", "middlename", "Aaron", "text", &field); |
| 1142 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); | 1147 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); |
| 1143 autofill_unittest::CreateTestFormField( | 1148 autofill_unittest::CreateTestFormField( |
| 1144 "Last Name", "lastname", "Presley", "text", &field); | 1149 "Last Name", "lastname", "Presley", "text", &field); |
| 1145 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2])); | 1150 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2])); |
| 1146 autofill_unittest::CreateTestFormField( | 1151 autofill_unittest::CreateTestFormField( |
| 1147 "Phone Number", "phonenumber", "", "text", &field); | 1152 "Phone Number", "phonenumber", "", "text", &field); |
| 1148 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3])); | 1153 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3])); |
| 1149 autofill_unittest::CreateTestFormField( | 1154 autofill_unittest::CreateTestFormField( |
| 1150 "Email", "email", "theking@gmail.com", "text", &field); | 1155 "Email", "email", "theking@gmail.com", "text", &field); |
| 1151 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[4])); | 1156 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[4])); |
| 1152 } | 1157 } |
| 1153 | 1158 |
| 1154 TEST_F(AutoFillManagerTest, HiddenFields) { | 1159 TEST_F(AutoFillManagerTest, HiddenFields) { |
| 1155 FormData form; | 1160 FormData form; |
| 1156 form.name = ASCIIToUTF16("MyForm"); | 1161 form.name = ASCIIToUTF16("MyForm"); |
| 1157 form.method = ASCIIToUTF16("POST"); | 1162 form.method = ASCIIToUTF16("POST"); |
| 1158 form.origin = GURL("http://myform.com/form.html"); | 1163 form.origin = GURL("http://myform.com/form.html"); |
| 1159 form.action = GURL("http://myform.com/submit.html"); | 1164 form.action = GURL("http://myform.com/submit.html"); |
| 1165 form.user_submitted = true; |
| 1160 | 1166 |
| 1161 webkit_glue::FormField field; | 1167 webkit_glue::FormField field; |
| 1162 autofill_unittest::CreateTestFormField( | 1168 autofill_unittest::CreateTestFormField( |
| 1163 "E-mail", "one", "one", "hidden", &field); | 1169 "E-mail", "one", "one", "hidden", &field); |
| 1164 form.fields.push_back(field); | 1170 form.fields.push_back(field); |
| 1165 autofill_unittest::CreateTestFormField( | 1171 autofill_unittest::CreateTestFormField( |
| 1166 "E-mail", "two", "two", "hidden", &field); | 1172 "E-mail", "two", "two", "hidden", &field); |
| 1167 form.fields.push_back(field); | 1173 form.fields.push_back(field); |
| 1168 autofill_unittest::CreateTestFormField( | 1174 autofill_unittest::CreateTestFormField( |
| 1169 "E-mail", "three", "three", "hidden", &field); | 1175 "E-mail", "three", "three", "hidden", &field); |
| 1170 form.fields.push_back(field); | 1176 form.fields.push_back(field); |
| 1171 | 1177 |
| 1172 // Set up our FormStructures. | 1178 // Set up our FormStructures. |
| 1173 std::vector<FormData> forms; | 1179 std::vector<FormData> forms; |
| 1174 forms.push_back(form); | 1180 forms.push_back(form); |
| 1175 autofill_manager_->FormsSeen(forms); | 1181 autofill_manager_->FormsSeen(forms); |
| 1176 | 1182 |
| 1177 // Submit the form. | 1183 // Submit the form. |
| 1178 autofill_manager_->FormSubmitted(form); | 1184 autofill_manager_->FormSubmitted(form); |
| 1179 | 1185 |
| 1180 // TODO(jhawkins): We can't use the InfoBar anymore to determine if we saved | 1186 // TODO(jhawkins): We can't use the InfoBar anymore to determine if we saved |
| 1181 // fields. Need to query the PDM. | 1187 // fields. Need to query the PDM. |
| 1182 } | 1188 } |
| 1183 | 1189 |
| 1184 } // namespace | 1190 } // namespace |
| OLD | NEW |