Autofill i18n: Set postal code and state field labels based on the selected country.

chrome/browser/webdata/web_database_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 <list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2024 matching lines @@
     return s.ColumnInt(0);
   }
 
   // The sql files located in "chrome/test/data/web_database" were generated by
   // launching the Chromium application prior to schema change, then using the
   // sqlite3 command-line application to dump the contents of the "Web Data"
   // database.
   // Like this:
   //   > .output version_nn.sql
   //   > .dump
-  void LoadDatabase(const FilePath& path);
+  void LoadDatabase(const FilePath::StringType& file);
 
   // Assertion testing for migrating from version 27 and 28.
   void MigrateVersion28Assertions();
 
  private:
   ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest);
 };
 
-const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 32;
+const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 33;
 
-void WebDatabaseMigrationTest::LoadDatabase(const FilePath& file) {
+void WebDatabaseMigrationTest::LoadDatabase(const FilePath::StringType& file) {
   std::string contents;
-  ASSERT_TRUE(GetWebDatabaseData(file, &contents));
+  ASSERT_TRUE(GetWebDatabaseData(FilePath(file), &contents));
 
   sql::Connection connection;
   ASSERT_TRUE(connection.Open(GetDatabasePath()));
   ASSERT_TRUE(connection.Execute(contents.data()));
 }
 
 void WebDatabaseMigrationTest::MigrateVersion28Assertions() {
   // Load the database via the WebDatabase class and migrate the database to
   // the current version.
   {
@@ skipping 84 matching lines @@
     EXPECT_TRUE(connection.DoesTableExist("token_service"));
   }
 }
 
 // Tests that the |credit_card| table gets added to the schema for a version 22
 // database.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion22ToCurrent) {
   // This schema is taken from a build prior to the addition of the
   // |credit_card| table.  Version 22 of the schema.  Contrast this with the
   // corrupt version below.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_22.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_22.sql")));
 
   // Verify pre-conditions.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     // No |credit_card| table prior to version 23.
     ASSERT_FALSE(connection.DoesColumnExist("credit_cards", "guid"));
     ASSERT_FALSE(
         connection.DoesColumnExist("credit_cards", "card_number_encrypted"));
@@ skipping 25 matching lines @@
 // Tests that the |credit_card| table gets added to the schema for a corrupt
 // version 22 database.  The corruption is that the |credit_cards| table exists
 // but the schema version number was not set correctly to 23 or later.  This
 // test exercises code introduced to fix bug http://crbug.com/50699 that
 // resulted from the corruption.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion22CorruptedToCurrent) {
   // This schema is taken from a build after the addition of the |credit_card|
   // table.  Due to a bug in the migration logic the version is set incorrectly
   // to 22 (it should have been updated to 23 at least).
   ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_22_corrupt.sql"))));
+      LoadDatabase(FILE_PATH_LITERAL("version_22_corrupt.sql")));
 
   // Verify pre-conditions.  These are expectations for corrupt version 22 of
   // the database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     // Columns existing and not existing before current version.
     ASSERT_TRUE(connection.DoesColumnExist("credit_cards", "unique_id"));
     ASSERT_TRUE(
@@ skipping 27 matching lines @@
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "id"));
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "logo_id"));
   }
 }
 
 // Tests that the |keywords| |logo_id| column gets added to the schema for a
 // version 24 database.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion24ToCurrent) {
   // This schema is taken from a build prior to the addition of the |keywords|
   // |logo_id| column.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_24.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_24.sql")));
 
   // Verify pre-conditions.  These are expectations for version 24 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     // Columns existing and not existing before current version.
     ASSERT_TRUE(connection.DoesColumnExist("keywords", "id"));
     ASSERT_FALSE(connection.DoesColumnExist("keywords", "logo_id"));
@@ skipping 19 matching lines @@
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "id"));
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "logo_id"));
   }
 }
 
 // Tests that the |keywords| |created_by_policy| column gets added to the schema
 // for a version 25 database.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion25ToCurrent) {
   // This schema is taken from a build prior to the addition of the |keywords|
   // |created_by_policy| column.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_25.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_25.sql")));
 
   // Verify pre-conditions.  These are expectations for version 25 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
   }
 
   // Load the database via the WebDatabase class and migrate the database to
   // the current version.
@@ skipping 16 matching lines @@
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "created_by_policy"));
   }
 }
 
 // Tests that the credit_cards.billing_address column is changed from a string
 // to an int whilst preserving the associated billing address. This version of
 // the test makes sure a stored label is converted to an ID.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion26ToCurrentStringLabels) {
   // This schema is taken from a build prior to the change of column type for
   // credit_cards.billing_address from string to int.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_26.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_26.sql")));
 
   // Verify pre-conditions. These are expectations for version 26 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     // Columns existing and not existing before current version.
     EXPECT_TRUE(connection.DoesColumnExist("credit_cards", "billing_address"));
 
@@ skipping 52 matching lines @@
     // Column 6 is date_modified.
   }
 }
 
 // Tests that the credit_cards.billing_address column is changed from a string
 // to an int whilst preserving the associated billing address. This version of
 // the test makes sure a stored string ID is converted to an integer ID.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion26ToCurrentStringIDs) {
   // This schema is taken from a build prior to the change of column type for
   // credit_cards.billing_address from string to int.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_26.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_26.sql")));
 
   // Verify pre-conditions. These are expectations for version 26 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
     EXPECT_TRUE(connection.DoesColumnExist("credit_cards", "billing_address"));
 
     std::string stmt = "INSERT INTO autofill_profiles"
       "(label, unique_id, first_name, middle_name, last_name, email,"
@@ skipping 52 matching lines @@
     EXPECT_EQ(2012, s.ColumnInt(4));
     // Column 5 is encrypted credit card number blob.
     // Column 6 is date_modified.
   }
 }
 
 // Tests migration from 27->current. This test is now the same as 28->current
 // as the column added in 28 was nuked in 29.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion27ToCurrent) {
   // Initialize the database.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_27.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_27.sql")));
 
   // Verify pre-conditions. These are expectations for version 28 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     ASSERT_FALSE(connection.DoesColumnExist("keywords", "supports_instant"));
     ASSERT_FALSE(connection.DoesColumnExist("keywords", "instant_url"));
   }
 
   MigrateVersion28Assertions();
 }
 
 // Makes sure instant_url is added correctly to keywords.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion28ToCurrent) {
   // Initialize the database.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_28.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_28.sql")));
 
   // Verify pre-conditions. These are expectations for version 28 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     ASSERT_TRUE(connection.DoesColumnExist("keywords", "supports_instant"));
     ASSERT_FALSE(connection.DoesColumnExist("keywords", "instant_url"));
   }
 
   MigrateVersion28Assertions();
 }
 
 // Makes sure date_modified is added correctly to autofill_profiles and
 // credit_cards.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion29ToCurrent) {
   // Initialize the database.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_29.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_29.sql")));
 
   // Verify pre-conditions.  These are expectations for version 29 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     EXPECT_FALSE(connection.DoesColumnExist("autofill_profiles",
                                             "date_modified"));
     EXPECT_FALSE(connection.DoesColumnExist("credit_cards",
@@ skipping 44 matching lines @@
       EXPECT_LE(s_credit_cards.ColumnInt64(0),
                 post_creation_time.ToTimeT());
     }
     EXPECT_TRUE(s_credit_cards.Succeeded());
   }
 }
 
 // Makes sure guids are added to autofill_profiles and credit_cards tables.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion30ToCurrent) {
   // Initialize the database.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_30.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_30.sql")));
 
   // Verify pre-conditions. These are expectations for version 29 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     EXPECT_FALSE(connection.DoesColumnExist("autofill_profiles", "guid"));
     EXPECT_FALSE(connection.DoesColumnExist("credit_cards", "guid"));
   }
@@ skipping 31 matching lines @@
     EXPECT_TRUE(guid::IsValidGUID(guid2));
 
     EXPECT_NE(guid1, guid2);
   }
 }
 
 // Removes unique IDs and make GUIDs the primary key.  Also removes unused
 // columns.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion31ToCurrent) {
   // Initialize the database.
-  ASSERT_NO_FATAL_FAILURE(
-      LoadDatabase(FilePath(FILE_PATH_LITERAL("version_31.sql"))));
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_31.sql")));
 
   // Verify pre-conditions. These are expectations for version 30 of the
   // database.
   AutoFillProfile profile;
   string16 profile_label;
   int profile_unique_id = 0;
   int64 profile_date_modified = 0;
   CreditCard credit_card;
   string16 cc_label;
   int cc_unique_id = 0;
@@ skipping 112 matching lines @@
                                                       &credit_card_a,
                                                       &cc_label_a,
                                                       &cc_number_encrypted_a,
                                                       &cc_date_modified_a));
     EXPECT_EQ(credit_card, credit_card_a);
     EXPECT_EQ(cc_label, cc_label_a);
     EXPECT_EQ(cc_number_encrypted, cc_number_encrypted_a);
     EXPECT_EQ(cc_date_modified, cc_date_modified_a);
   }
 }
+
+// Adds a column for the autofill profile's country code.
+TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
+  // Initialize the database.
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_32.sql")));
+
+  // Verify pre-conditions. These are expectations for version 32 of the
+  // database.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+
+    EXPECT_FALSE(connection.DoesColumnExist("autofill_profiles",
+                                            "country_code"));
+
+    // Check that the country value is the one we expect.
+    sql::Statement s(
+        connection.GetUniqueStatement("SELECT country FROM autofill_profiles"));
+
+    ASSERT_TRUE(s.Step());
+    std::string country = s.ColumnString(0);
+    EXPECT_EQ("United States", country);
+  }
+
+  // Load the database via the WebDatabase class and migrate the database to
+  // the current version.
+  {
+    WebDatabase db;
+    ASSERT_EQ(sql::INIT_OK, db.Init(GetDatabasePath()));
+  }
+
+  // Verify post-conditions.  These are expectations for current version of the
+  // database.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+
+    // Check version.
+    EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
+
+    ASSERT_TRUE(connection.DoesColumnExist("autofill_profiles",
+                                           "country_code"));
+
+    // Check that the country code is properly converted.
+    sql::Statement s(connection.GetUniqueStatement(
+        "SELECT country_code FROM autofill_profiles"));
+
+    ASSERT_TRUE(s.Step());
+    std::string country_code = s.ColumnString(0);
+    EXPECT_EQ("US", country_code);
+  }
+}
+