| 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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 // Test that we sent the right message to the renderer. | 304 // Test that we sent the right message to the renderer. |
| 305 int page_id = 0; | 305 int page_id = 0; |
| 306 std::vector<string16> values; | 306 std::vector<string16> values; |
| 307 std::vector<string16> labels; | 307 std::vector<string16> labels; |
| 308 EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels)); | 308 EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels)); |
| 309 EXPECT_EQ(kPageID, page_id); | 309 EXPECT_EQ(kPageID, page_id); |
| 310 ASSERT_EQ(2U, values.size()); | 310 ASSERT_EQ(2U, values.size()); |
| 311 EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]); | 311 EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]); |
| 312 EXPECT_EQ(ASCIIToUTF16("Charles"), values[1]); | 312 EXPECT_EQ(ASCIIToUTF16("Charles"), values[1]); |
| 313 ASSERT_EQ(2U, labels.size()); | 313 ASSERT_EQ(2U, labels.size()); |
| 314 EXPECT_EQ(ASCIIToUTF16("Home"), labels[0]); | 314 // Inferred labels now include full first relevant field, which in this case |
| 315 EXPECT_EQ(ASCIIToUTF16("Work"), labels[1]); | 315 // the address #1. |
| 316 EXPECT_EQ(ASCIIToUTF16("3734 Elvis Presley Blvd."), labels[0]); |
| 317 EXPECT_EQ(ASCIIToUTF16("123 Apple St."), labels[1]); |
| 316 } | 318 } |
| 317 | 319 |
| 318 TEST_F(AutoFillManagerTest, GetProfileSuggestionsMatchCharacter) { | 320 TEST_F(AutoFillManagerTest, GetProfileSuggestionsMatchCharacter) { |
| 319 FormData form; | 321 FormData form; |
| 320 CreateTestFormData(&form); | 322 CreateTestFormData(&form); |
| 321 | 323 |
| 322 // Set up our FormStructures. | 324 // Set up our FormStructures. |
| 323 std::vector<FormData> forms; | 325 std::vector<FormData> forms; |
| 324 forms.push_back(form); | 326 forms.push_back(form); |
| 325 autofill_manager_->FormsSeen(forms); | 327 autofill_manager_->FormsSeen(forms); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 339 | 341 |
| 340 // Test that we sent the right message to the renderer. | 342 // Test that we sent the right message to the renderer. |
| 341 int page_id = 0; | 343 int page_id = 0; |
| 342 std::vector<string16> values; | 344 std::vector<string16> values; |
| 343 std::vector<string16> labels; | 345 std::vector<string16> labels; |
| 344 EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels)); | 346 EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels)); |
| 345 EXPECT_EQ(kPageID, page_id); | 347 EXPECT_EQ(kPageID, page_id); |
| 346 ASSERT_EQ(1U, values.size()); | 348 ASSERT_EQ(1U, values.size()); |
| 347 EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]); | 349 EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]); |
| 348 ASSERT_EQ(1U, labels.size()); | 350 ASSERT_EQ(1U, labels.size()); |
| 349 EXPECT_EQ(ASCIIToUTF16("Home"), labels[0]); | 351 EXPECT_EQ(ASCIIToUTF16("3734 Elvis Presley Blvd."), labels[0]); |
| 350 } | 352 } |
| 351 | 353 |
| 352 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsEmptyValue) { | 354 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsEmptyValue) { |
| 353 FormData form; | 355 FormData form; |
| 354 CreateTestFormDataBilling(&form); | 356 CreateTestFormDataBilling(&form); |
| 355 | 357 |
| 356 // Set up our FormStructures. | 358 // Set up our FormStructures. |
| 357 std::vector<FormData> forms; | 359 std::vector<FormData> forms; |
| 358 forms.push_back(form); | 360 forms.push_back(form); |
| 359 autofill_manager_->FormsSeen(forms); | 361 autofill_manager_->FormsSeen(forms); |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 std::vector<string16> values; | 585 std::vector<string16> values; |
| 584 std::vector<string16> labels; | 586 std::vector<string16> labels; |
| 585 EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels)); | 587 EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels)); |
| 586 EXPECT_EQ(kPageID, page_id); | 588 EXPECT_EQ(kPageID, page_id); |
| 587 ASSERT_EQ(4U, values.size()); | 589 ASSERT_EQ(4U, values.size()); |
| 588 EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]); | 590 EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]); |
| 589 EXPECT_EQ(ASCIIToUTF16("Charles"), values[1]); | 591 EXPECT_EQ(ASCIIToUTF16("Charles"), values[1]); |
| 590 EXPECT_EQ(ASCIIToUTF16("Jay"), values[2]); | 592 EXPECT_EQ(ASCIIToUTF16("Jay"), values[2]); |
| 591 EXPECT_EQ(ASCIIToUTF16("Jason"), values[3]); | 593 EXPECT_EQ(ASCIIToUTF16("Jason"), values[3]); |
| 592 ASSERT_EQ(4U, labels.size()); | 594 ASSERT_EQ(4U, labels.size()); |
| 593 EXPECT_EQ(ASCIIToUTF16("Home"), labels[0]); | 595 EXPECT_EQ(ASCIIToUTF16("3734 Elvis Presley Blvd."), labels[0]); |
| 594 EXPECT_EQ(ASCIIToUTF16("Work"), labels[1]); | 596 EXPECT_EQ(ASCIIToUTF16("123 Apple St."), labels[1]); |
| 595 EXPECT_EQ(string16(), labels[2]); | 597 EXPECT_EQ(string16(), labels[2]); |
| 596 EXPECT_EQ(string16(), labels[3]); | 598 EXPECT_EQ(string16(), labels[3]); |
| 597 } | 599 } |
| 598 | 600 |
| 599 TEST_F(AutoFillManagerTest, GetFieldSuggestionsFormIsAutoFilled) { | 601 TEST_F(AutoFillManagerTest, GetFieldSuggestionsFormIsAutoFilled) { |
| 600 FormData form; | 602 FormData form; |
| 601 CreateTestFormData(&form); | 603 CreateTestFormData(&form); |
| 602 | 604 |
| 603 // Set up our FormStructures. | 605 // Set up our FormStructures. |
| 604 std::vector<FormData> forms; | 606 std::vector<FormData> forms; |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1173 autofill_manager_->FormsSeen(forms); | 1175 autofill_manager_->FormsSeen(forms); |
| 1174 | 1176 |
| 1175 // Submit the form. | 1177 // Submit the form. |
| 1176 autofill_manager_->FormSubmitted(form); | 1178 autofill_manager_->FormSubmitted(form); |
| 1177 | 1179 |
| 1178 // TODO(jhawkins): We can't use the InfoBar anymore to determine if we saved | 1180 // TODO(jhawkins): We can't use the InfoBar anymore to determine if we saved |
| 1179 // fields. Need to query the PDM. | 1181 // fields. Need to query the PDM. |
| 1180 } | 1182 } |
| 1181 | 1183 |
| 1182 } // namespace | 1184 } // namespace |
| OLD | NEW |