Autofill refactor form_field.h/cc.

chrome/browser/autofill/credit_card_field_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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/autofill_field.h"
 #include "chrome/browser/autofill/autofill_scanner.h"
 #include "chrome/browser/autofill/credit_card_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
 
-namespace {
-
 class CreditCardFieldTest : public testing::Test {
  public:
   CreditCardFieldTest() {}
 
  protected:
   ScopedVector<AutofillField> list_;
   scoped_ptr<CreditCardField> field_;
   FieldTypeMap field_type_map_;
   std::vector<AutofillField*>::const_iterator iter_;
 
@@ skipping 71 matching lines @@
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Exp Year"),
                                                ASCIIToUTF16("ccyear"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("year1")));
   AutofillScanner scanner(list_.get());
   field_.reset(CreditCardField::Parse(&scanner, false));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("month1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("year1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
       field_type_map_[ASCIIToUTF16("year1")]);
@@ skipping 22 matching lines @@
           webkit_glue::FormField(ASCIIToUTF16("Exp Year"),
                                  ASCIIToUTF16(kEcmlCardExpireYear),
                                  string16(),
                                  ASCIIToUTF16("text"),
                                  0,
                                  false),
           ASCIIToUTF16("year1")));
   AutofillScanner scanner(list_.get());
   field_.reset(CreditCardField::Parse(&scanner, false));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("month1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("year1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
       field_type_map_[ASCIIToUTF16("year1")]);
@@ skipping 36 matching lines @@
       new AutofillField(webkit_glue::FormField(ASCIIToUTF16("Verification"),
                                                ASCIIToUTF16("verification"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0,
                                                false),
                         ASCIIToUTF16("cvc1")));
   AutofillScanner scanner(list_.get());
   field_.reset(CreditCardField::Parse(&scanner, false));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("month1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month1")]);
   ASSERT_TRUE(
@@ skipping 45 matching lines @@
           webkit_glue::FormField(ASCIIToUTF16("Verification"),
                                  ASCIIToUTF16(kEcmlCardVerification),
                                  string16(),
                                  ASCIIToUTF16("text"),
                                  0,
                                  false),
           ASCIIToUTF16("cvc1")));
   AutofillScanner scanner(list_.get());
   field_.reset(CreditCardField::Parse(&scanner, false));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("number1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number1")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("month1")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month1")]);
   ASSERT_TRUE(
@@ skipping 36 matching lines @@
           webkit_glue::FormField(ASCIIToUTF16("ExpDate Month / Year"),
                                  ASCIIToUTF16("ExpDate"),
                                  string16(),
                                  ASCIIToUTF16("text"),
                                  0,
                                  false),
           ASCIIToUTF16("year")));
   AutofillScanner scanner(list_.get());
   field_.reset(CreditCardField::Parse(&scanner, false));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("number")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("month")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month")]);
   ASSERT_TRUE(
@@ skipping 33 matching lines @@
           webkit_glue::FormField(ASCIIToUTF16("Expiration date Month / Year"),
                                  ASCIIToUTF16("ExpDate"),
                                  string16(),
                                  ASCIIToUTF16("text"),
                                  0,
                                  false),
           ASCIIToUTF16("year")));
   AutofillScanner scanner(list_.get());
   field_.reset(CreditCardField::Parse(&scanner, false));
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
-  ASSERT_TRUE(field_->GetFieldInfo(&field_type_map_));
+  ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("name")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("number")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER, field_type_map_[ASCIIToUTF16("number")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("month")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month")]);
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("year")) != field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
       field_type_map_[ASCIIToUTF16("year")]);
 }
-
-}  // namespace
-