Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(584)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autofill/address_field_unittest.cc

Issue 7043027: Autofill refactor form_field.h/cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/autofill/address_field.cc ('K') | « chrome/browser/autofill/address_field.cc ('k') | chrome/browser/autofill/autofill_ecml.h » ('j') | chrome/browser/autofill/form_field.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autofill/address_field_unittest.cc
diff --git a/chrome/browser/autofill/address_field_unittest.cc b/chrome/browser/autofill/address_field_unittest.cc
index fe7a9107f84431f54a86283a6ac009edaa86d90e..fe4d77a55da001a8749427d4fd87769c3f1e4ff8 100644
--- a/chrome/browser/autofill/address_field_unittest.cc
+++ b/chrome/browser/autofill/address_field_unittest.cc
@@ -5,14 +5,13 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/autofill/autofill_ecml.h"
#include "chrome/browser/autofill/address_field.h"
#include "chrome/browser/autofill/autofill_field.h"
#include "chrome/browser/autofill/autofill_scanner.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
-namespace {
-
class AddressFieldTest : public testing::Test {
public:
AddressFieldTest() {}
@@ -54,7 +53,7 @@ TEST_F(AddressFieldTest, ParseOneLineAddress) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -74,7 +73,7 @@ TEST_F(AddressFieldTest, ParseOneLineAddressBilling) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kBillingAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_BILLING_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -94,7 +93,7 @@ TEST_F(AddressFieldTest, ParseOneLineAddressShipping) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kShippingAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -115,7 +114,7 @@ TEST_F(AddressFieldTest, ParseOneLineAddressEcml) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kShippingAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -143,7 +142,7 @@ TEST_F(AddressFieldTest, ParseTwoLineAddress) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -182,7 +181,7 @@ TEST_F(AddressFieldTest, ParseThreeLineAddress) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -217,7 +216,7 @@ TEST_F(AddressFieldTest, ParseTwoLineAddressEcml) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kShippingAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -240,7 +239,7 @@ TEST_F(AddressFieldTest, ParseCity) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("city1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_CITY, field_type_map_[ASCIIToUTF16("city1")]);
@@ -260,7 +259,7 @@ TEST_F(AddressFieldTest, ParseCityEcml) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("city1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_CITY, field_type_map_[ASCIIToUTF16("city1")]);
@@ -280,7 +279,7 @@ TEST_F(AddressFieldTest, ParseState) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("state1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_STATE, field_type_map_[ASCIIToUTF16("state1")]);
@@ -301,7 +300,7 @@ TEST_F(AddressFieldTest, ParseStateEcml) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("state1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_STATE, field_type_map_[ASCIIToUTF16("state1")]);
@@ -321,7 +320,7 @@ TEST_F(AddressFieldTest, ParseZip) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("zip1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_ZIP, field_type_map_[ASCIIToUTF16("zip1")]);
@@ -342,7 +341,7 @@ TEST_F(AddressFieldTest, ParseZipEcml) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("zip1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_ZIP, field_type_map_[ASCIIToUTF16("zip1")]);
@@ -374,7 +373,7 @@ TEST_F(AddressFieldTest, ParseStateAndZipOneLabel) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("state")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_STATE, field_type_map_[ASCIIToUTF16("state")]);
@@ -397,7 +396,7 @@ TEST_F(AddressFieldTest, ParseCountry) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("country1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_COUNTRY, field_type_map_[ASCIIToUTF16("country1")]);
@@ -417,7 +416,7 @@ TEST_F(AddressFieldTest, ParseCountryEcml) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("country1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_COUNTRY, field_type_map_[ASCIIToUTF16("country1")]);
@@ -445,7 +444,7 @@ TEST_F(AddressFieldTest, ParseTwoLineAddressMissingLabel) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_TRUE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end());
EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]);
@@ -468,7 +467,7 @@ TEST_F(AddressFieldTest, ParseCompany) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("company1")) != field_type_map_.end());
EXPECT_EQ(COMPANY_NAME, field_type_map_[ASCIIToUTF16("company1")]);
@@ -489,10 +488,8 @@ TEST_F(AddressFieldTest, ParseCompanyEcml) {
ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
EXPECT_EQ(kGenericAddress, field_->FindType());
EXPECT_FALSE(field_->IsFullAddress());
- ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+ ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
ASSERT_TRUE(
field_type_map_.find(ASCIIToUTF16("company1")) != field_type_map_.end());
EXPECT_EQ(COMPANY_NAME, field_type_map_[ASCIIToUTF16("company1")]);
}
-
-} // namespace
« chrome/browser/autofill/address_field.cc ('K') | « chrome/browser/autofill/address_field.cc ('k') | chrome/browser/autofill/autofill_ecml.h » ('j') | chrome/browser/autofill/form_field.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698