| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 "Phone Number", "phonenumber", "", "text", &field); | 157 "Phone Number", "phonenumber", "", "text", &field); |
| 158 form->fields.push_back(field); | 158 form->fields.push_back(field); |
| 159 autofill_unittest::CreateTestFormField( | 159 autofill_unittest::CreateTestFormField( |
| 160 "Email", "email", "", "text", &field); | 160 "Email", "email", "", "text", &field); |
| 161 form->fields.push_back(field); | 161 form->fields.push_back(field); |
| 162 } | 162 } |
| 163 | 163 |
| 164 void CreateTestFormDataBilling(FormData* form) { | 164 void CreateTestFormDataBilling(FormData* form) { |
| 165 form->name = ASCIIToUTF16("MyForm"); | 165 form->name = ASCIIToUTF16("MyForm"); |
| 166 form->method = ASCIIToUTF16("POST"); | 166 form->method = ASCIIToUTF16("POST"); |
| 167 form->origin = GURL("http://myform.com/form.html"); | 167 form->origin = GURL("https://myform.com/form.html"); |
| 168 form->action = GURL("http://myform.com/submit.html"); | 168 form->action = GURL("https://myform.com/submit.html"); |
| 169 | 169 |
| 170 webkit_glue::FormField field; | 170 webkit_glue::FormField field; |
| 171 autofill_unittest::CreateTestFormField( | 171 autofill_unittest::CreateTestFormField( |
| 172 "First Name", "firstname", "", "text", &field); | 172 "First Name", "firstname", "", "text", &field); |
| 173 form->fields.push_back(field); | 173 form->fields.push_back(field); |
| 174 autofill_unittest::CreateTestFormField( | 174 autofill_unittest::CreateTestFormField( |
| 175 "Middle Name", "middlename", "", "text", &field); | 175 "Middle Name", "middlename", "", "text", &field); |
| 176 form->fields.push_back(field); | 176 form->fields.push_back(field); |
| 177 autofill_unittest::CreateTestFormField( | 177 autofill_unittest::CreateTestFormField( |
| 178 "Last Name", "lastname", "", "text", &field); | 178 "Last Name", "lastname", "", "text", &field); |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 EXPECT_EQ(ASCIIToUTF16("Home; 3456"), labels[0]); | 513 EXPECT_EQ(ASCIIToUTF16("Home; 3456"), labels[0]); |
| 514 EXPECT_EQ(ASCIIToUTF16("Work; 3456"), labels[1]); | 514 EXPECT_EQ(ASCIIToUTF16("Work; 3456"), labels[1]); |
| 515 EXPECT_EQ(ASCIIToUTF16("Empty; 3456"), labels[2]); | 515 EXPECT_EQ(ASCIIToUTF16("Empty; 3456"), labels[2]); |
| 516 EXPECT_EQ(ASCIIToUTF16("Home; 8765; 3456"), labels[3]); | 516 EXPECT_EQ(ASCIIToUTF16("Home; 8765; 3456"), labels[3]); |
| 517 EXPECT_EQ(ASCIIToUTF16("Home; 8765"), labels[4]); | 517 EXPECT_EQ(ASCIIToUTF16("Home; 8765"), labels[4]); |
| 518 EXPECT_EQ(ASCIIToUTF16("Work; 8765"), labels[5]); | 518 EXPECT_EQ(ASCIIToUTF16("Work; 8765"), labels[5]); |
| 519 EXPECT_EQ(ASCIIToUTF16("Empty; 8765"), labels[6]); | 519 EXPECT_EQ(ASCIIToUTF16("Empty; 8765"), labels[6]); |
| 520 EXPECT_EQ(ASCIIToUTF16("Home; 8765; 8765"), labels[7]); | 520 EXPECT_EQ(ASCIIToUTF16("Home; 8765; 8765"), labels[7]); |
| 521 } | 521 } |
| 522 | 522 |
| 523 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonHTTPS) { |
| 524 FormData form; |
| 525 CreateTestFormDataBilling(&form); |
| 526 form.origin = GURL("http://myform.com/form.html"); |
| 527 |
| 528 // Set up our FormStructures. |
| 529 std::vector<FormData> forms; |
| 530 forms.push_back(form); |
| 531 autofill_manager_->FormsSeen(forms); |
| 532 |
| 533 // The page ID sent to the AutoFillManager from the RenderView, used to send |
| 534 // an IPC message back to the renderer. |
| 535 const int kPageID = 1; |
| 536 |
| 537 webkit_glue::FormField field; |
| 538 autofill_unittest::CreateTestFormField( |
| 539 "Card Number", "cardnumber", "", "text", &field); |
| 540 EXPECT_FALSE( |
| 541 autofill_manager_->GetAutoFillSuggestions(kPageID, false, field)); |
| 542 } |
| 543 |
| 523 TEST_F(AutoFillManagerTest, GetCombinedAutoFillAndAutocompleteSuggestions) { | 544 TEST_F(AutoFillManagerTest, GetCombinedAutoFillAndAutocompleteSuggestions) { |
| 524 FormData form; | 545 FormData form; |
| 525 CreateTestFormData(&form); | 546 CreateTestFormData(&form); |
| 526 | 547 |
| 527 // Set up our FormStructures. | 548 // Set up our FormStructures. |
| 528 std::vector<FormData> forms; | 549 std::vector<FormData> forms; |
| 529 forms.push_back(form); | 550 forms.push_back(form); |
| 530 autofill_manager_->FormsSeen(forms); | 551 autofill_manager_->FormsSeen(forms); |
| 531 | 552 |
| 532 // The page ID sent to the AutoFillManager from the RenderView, used to send | 553 // The page ID sent to the AutoFillManager from the RenderView, used to send |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 autofill_manager_->FillAutoFillFormData(kPageID, | 714 autofill_manager_->FillAutoFillFormData(kPageID, |
| 694 form, | 715 form, |
| 695 string16(), | 716 string16(), |
| 696 ASCIIToUTF16("Home; 3456"))); | 717 ASCIIToUTF16("Home; 3456"))); |
| 697 | 718 |
| 698 int page_id = 0; | 719 int page_id = 0; |
| 699 FormData results; | 720 FormData results; |
| 700 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); | 721 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); |
| 701 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); | 722 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); |
| 702 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); | 723 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); |
| 703 EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin); | 724 EXPECT_EQ(GURL("https://myform.com/form.html"), results.origin); |
| 704 EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action); | 725 EXPECT_EQ(GURL("https://myform.com/submit.html"), results.action); |
| 705 ASSERT_EQ(15U, results.fields.size()); | 726 ASSERT_EQ(15U, results.fields.size()); |
| 706 | 727 |
| 707 webkit_glue::FormField field; | 728 webkit_glue::FormField field; |
| 708 autofill_unittest::CreateTestFormField( | 729 autofill_unittest::CreateTestFormField( |
| 709 "First Name", "firstname", "Elvis", "text", &field); | 730 "First Name", "firstname", "Elvis", "text", &field); |
| 710 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); | 731 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); |
| 711 autofill_unittest::CreateTestFormField( | 732 autofill_unittest::CreateTestFormField( |
| 712 "Middle Name", "middlename", "Aaron", "text", &field); | 733 "Middle Name", "middlename", "Aaron", "text", &field); |
| 713 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); | 734 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); |
| 714 autofill_unittest::CreateTestFormField( | 735 autofill_unittest::CreateTestFormField( |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 847 // an IPC message back to the renderer. | 868 // an IPC message back to the renderer. |
| 848 const int kPageID = 1; | 869 const int kPageID = 1; |
| 849 EXPECT_TRUE(autofill_manager_->FillAutoFillFormData( | 870 EXPECT_TRUE(autofill_manager_->FillAutoFillFormData( |
| 850 kPageID, form, string16(), ASCIIToUTF16("Home; 8765; 3456"))); | 871 kPageID, form, string16(), ASCIIToUTF16("Home; 8765; 3456"))); |
| 851 | 872 |
| 852 int page_id = 0; | 873 int page_id = 0; |
| 853 FormData results; | 874 FormData results; |
| 854 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); | 875 EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results)); |
| 855 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); | 876 EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name); |
| 856 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); | 877 EXPECT_EQ(ASCIIToUTF16("POST"), results.method); |
| 857 EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin); | 878 EXPECT_EQ(GURL("https://myform.com/form.html"), results.origin); |
| 858 EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action); | 879 EXPECT_EQ(GURL("https://myform.com/submit.html"), results.action); |
| 859 ASSERT_EQ(15U, results.fields.size()); | 880 ASSERT_EQ(15U, results.fields.size()); |
| 860 | 881 |
| 861 webkit_glue::FormField field; | 882 webkit_glue::FormField field; |
| 862 autofill_unittest::CreateTestFormField( | 883 autofill_unittest::CreateTestFormField( |
| 863 "First Name", "firstname", "Joe", "text", &field); | 884 "First Name", "firstname", "Joe", "text", &field); |
| 864 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); | 885 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0])); |
| 865 autofill_unittest::CreateTestFormField( | 886 autofill_unittest::CreateTestFormField( |
| 866 "Middle Name", "middlename", "", "text", &field); | 887 "Middle Name", "middlename", "", "text", &field); |
| 867 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); | 888 EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1])); |
| 868 autofill_unittest::CreateTestFormField( | 889 autofill_unittest::CreateTestFormField( |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1134 autofill_manager_->FormsSeen(forms); | 1155 autofill_manager_->FormsSeen(forms); |
| 1135 | 1156 |
| 1136 // Submit the form. | 1157 // Submit the form. |
| 1137 autofill_manager_->FormSubmitted(form); | 1158 autofill_manager_->FormSubmitted(form); |
| 1138 | 1159 |
| 1139 // TODO(jhawkins): We can't use the InfoBar anymore to determine if we saved | 1160 // TODO(jhawkins): We can't use the InfoBar anymore to determine if we saved |
| 1140 // fields. Need to query the PDM. | 1161 // fields. Need to query the PDM. |
| 1141 } | 1162 } |
| 1142 | 1163 |
| 1143 } // namespace | 1164 } // namespace |
| OLD | NEW |