Introduces a search term extraction mechanism working for arbitrary search providers.

chrome/browser/webdata/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/file_util.h"
 #include "base/guid.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 177 matching lines @@
   void LoadDatabase(const FilePath::StringType& file);
 
  private:
   MessageLoopForUI message_loop_for_ui_;
   content::TestBrowserThread ui_thread_;
   ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest);
 };
 
-const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 46;
+const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 47;
 
 void WebDatabaseMigrationTest::LoadDatabase(const FilePath::StringType& file) {
   std::string contents;
   ASSERT_TRUE(GetWebDatabaseData(FilePath(file), &contents));
 
   sql::Connection connection;
   ASSERT_TRUE(connection.Open(GetDatabasePath()));
   ASSERT_TRUE(connection.Execute(contents.data()));
 }
 
@@ skipping 342 matching lines @@
     EXPECT_FALSE(connection.DoesColumnExist("keywords", "supports_instant"));
     EXPECT_TRUE(connection.DoesColumnExist("keywords", "instant_url"));
 
     // Check that instant_url is empty.
     std::string stmt = "SELECT instant_url FROM keywords";
     sql::Statement s(connection.GetUniqueStatement(stmt.c_str()));
     ASSERT_TRUE(s.Step());
     EXPECT_EQ(std::string(), s.ColumnString(0));
 
     // Verify the data made it over.
-    stmt = "SELECT " + std::string(KeywordTable::kKeywordColumns) +
-        " FROM keywords";
+    stmt = "SELECT " + KeywordTable::GetKeywordColumns() + " FROM keywords";
     sql::Statement s2(connection.GetUniqueStatement(stmt.c_str()));
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ(2, s2.ColumnInt(0));
     EXPECT_EQ("Google", s2.ColumnString(1));
     EXPECT_EQ("google.com", s2.ColumnString(2));
     EXPECT_EQ("http://www.google.com/favicon.ico", s2.ColumnString(3));
     EXPECT_EQ("{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}"\
         "{google:originalQueryForSuggestion}sourceid=chrome&ie={inputEncoding}"\
         "&q={searchTerms}",
         s2.ColumnString(4));
@@ skipping 1203 matching lines @@
     EXPECT_TRUE(meta_table.GetValue(KeywordTable::kDefaultSearchIDBackupKey,
                                     &default_search_provider_id_backup));
     EXPECT_EQ(default_search_provider_id, default_search_provider_id_backup);
 
     std::string default_search_provider_id_backup_signature;
     EXPECT_TRUE(meta_table.GetValue(KeywordTable::kBackupSignatureKey,
         &default_search_provider_id_backup_signature));
     EXPECT_FALSE(default_search_provider_id_backup_signature.empty());
 
     EXPECT_TRUE(connection.DoesTableExist("keywords_backup"));
-    std::string query("SELECT " + std::string(KeywordTable::kKeywordColumns) +
+    std::string query("SELECT " + KeywordTable::GetKeywordColumns() +
                       " FROM keywords_backup");
     sql::Statement s(connection.GetUniqueStatement(query.c_str()));
     ASSERT_TRUE(s.Step());
     EXPECT_EQ(2, s.ColumnInt(0));
     EXPECT_EQ("Google", s.ColumnString(1));
     EXPECT_EQ("google.com", s.ColumnString(2));
     EXPECT_EQ("http://www.google.com/favicon.ico", s.ColumnString(3));
     EXPECT_EQ("{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}"
               "{google:originalQueryForSuggestion}sourceid=chrome&"
               "ie={inputEncoding}&q={searchTerms}",
@@ skipping 405 matching lines @@
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
     EXPECT_LE(45, VersionFromConnection(&connection));
   }
 }
+
+// Tests that the |alternate_urls| column is added to the keyword table schema
+// for a version 45 database.
+TEST_F(WebDatabaseMigrationTest, MigrateVersion46ToCurrent) {
+  ASSERT_NO_FATAL_FAILURE(
+      LoadDatabase(FILE_PATH_LITERAL("version_46.sql")));
+
+  // Verify pre-conditions.  These are expectations for version 46 of the
+  // database.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    sql::MetaTable meta_table;
+    ASSERT_TRUE(meta_table.Init(&connection, 46, 46));
+
+    ASSERT_FALSE(connection.DoesColumnExist("keywords", "alternate_urls"));
+    ASSERT_FALSE(connection.DoesColumnExist("keywords_backup",
+                                            "alternate_urls"));
+  }
+
+  // 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()));
+    ASSERT_FALSE(db.GetKeywordTable()->DidDefaultSearchProviderChange());
+  }
+
+  // Verify post-conditions.  These are expectations for current version of the
+  // database.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    // Check version.
+    EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
+
+    // A new column should have been created.
+    EXPECT_TRUE(connection.DoesColumnExist("keywords", "alternate_urls"));
+    ASSERT_TRUE(connection.DoesColumnExist("keywords_backup",
+                                           "alternate_urls"));
+  }
+}