Add field to monitor last visited time for each search engine

components/webdata/common/web_database_migration_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/macros.h"
@@ skipping 112 matching lines @@
   //   > .output version_nn.sql
   //   > .dump
   void LoadDatabase(const base::FilePath::StringType& file);
 
  private:
   base::ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest);
 };
 
-const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 68;
+const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 69;
 
 void WebDatabaseMigrationTest::LoadDatabase(
     const base::FilePath::StringType& file) {
   std::string contents;
   ASSERT_TRUE(GetWebDatabaseData(base::FilePath(file), &contents));
 
   sql::Connection connection;
   ASSERT_TRUE(connection.Open(GetDatabasePath()));
   ASSERT_TRUE(connection.Execute(contents.data()));
 }
@@ skipping 13 matching lines @@
     // version_nn.sql file.
     if (i == 52)
       continue;
 
     connection.Raze();
     const base::FilePath& file_name = base::FilePath::FromUTF8Unsafe(
         "version_" + base::IntToString(i) + ".sql");
     ASSERT_NO_FATAL_FAILURE(LoadDatabase(file_name.value()))
         << "Failed to load " << file_name.MaybeAsASCII();
     DoMigration();
+
     EXPECT_EQ(expected_schema, RemoveQuotes(connection.GetSchema()))
         << "For version " << i;
+

[Peter Kasting, 2016/11/21 03:35:08]

Nit: Extra blank line

[ltian, 2016/11/28 22:08:02]

Done.

   }
 }
 
 // Tests that the all migrations from an empty database succeed.
 TEST_F(WebDatabaseMigrationTest, MigrateEmptyToCurrent) {
   DoMigration();
 
   // Verify post-conditions.  These are expectations for current version of the
   // database.
   {
@@ skipping 884 matching lines @@
                                            "billing_address_id"));
 
     sql::Statement read_masked(connection.GetUniqueStatement(
         "SELECT name_on_card, billing_address_id FROM masked_credit_cards"));
     ASSERT_TRUE(read_masked.Step());
     EXPECT_EQ("Alice", read_masked.ColumnString(0));
     EXPECT_TRUE(read_masked.ColumnString(1).empty());
   }
 }
 
 // Tests delete show_in_default_list column in keywords table.

[Peter Kasting, 2016/11/21 03:35:08]

Nit: While here: delete -> deletion of

(I missed this in the previous CL)

[ltian, 2016/11/28 22:08:02]

Done.

 TEST_F(WebDatabaseMigrationTest, MigrateVersion67ToCurrent) {
   ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_67.sql")));
 
   // Verify pre-conditions.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
     sql::MetaTable meta_table;
@@ skipping 10 matching lines @@
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     EXPECT_FALSE(
         connection.DoesColumnExist("keywords", "show_in_default_list"));
   }
 }
+
+// Tests add last_visited column in keywords table.

[Peter Kasting, 2016/11/21 03:35:08]

Nit: add -> addition of

[ltian, 2016/11/28 22:08:02]

Done.

+TEST_F(WebDatabaseMigrationTest, MigrateVersion68ToCurrent) {
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_68.sql")));
+
+  // Verify pre-conditions.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    sql::MetaTable meta_table;
+    ASSERT_TRUE(meta_table.Init(&connection, 68, 68));
+
+    EXPECT_FALSE(connection.DoesColumnExist("keywords", "last_visited"));
+  }
+
+  DoMigration();
+
+  // Verify post-conditions.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    // Check version.
+    EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
+
+    EXPECT_TRUE(
+        connection.DoesColumnExist("keywords", "last_visited"));
+  }
+}