Remove unused SQLLite tables from WebData

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/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/webdata/web_apps_table.h"
-#include "chrome/browser/webdata/web_intents_table.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/webdata/autofill_change.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/password_manager/core/browser/webdata/logins_table.h"
 #include "components/search_engines/keyword_table.h"
 #include "components/signin/core/browser/webdata/token_service_table.h"
@@ skipping 151 matching lines @@
   // the current version.
   void DoMigration() {
     // TODO(joi): This whole unit test file needs to stay in //chrome
     // for now, as it needs to know about all the different table
     // types. Once all webdata datatypes have been componentized, this
     // could move to components_unittests.
     AutofillTable autofill_table("en-US");
     KeywordTable keyword_table;
     LoginsTable logins_table;
     TokenServiceTable token_service_table;
-    WebAppsTable web_apps_table;
-    WebIntentsTable web_intents_table;
 
     WebDatabase db;
     db.AddTable(&autofill_table);
     db.AddTable(&keyword_table);
     db.AddTable(&logins_table);
     db.AddTable(&token_service_table);
-    db.AddTable(&web_apps_table);
-    db.AddTable(&web_intents_table);
 
     // This causes the migration to occur.
     ASSERT_EQ(sql::INIT_OK, db.Init(GetDatabasePath()));
   }
 
  protected:
   // Current tested version number.  When adding a migration in
   // |WebDatabase::MigrateOldVersionsAsNeeded()| and changing the version number
   // |kCurrentVersionNumber| this value should change to reflect the new version
   // number and a new migration test added below.
@@ skipping 37 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 = 57;
+const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 58;
 
 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 35 matching lines @@
     // The autofill_dates table is obsolete. (It's been merged into the autofill
     // table.)
     EXPECT_FALSE(connection.DoesTableExist("autofill_dates"));
     EXPECT_TRUE(connection.DoesTableExist("autofill_profiles"));
     EXPECT_TRUE(connection.DoesTableExist("credit_cards"));
     EXPECT_TRUE(connection.DoesTableExist("keywords"));
     // The logins table is obsolete. (We used to store saved passwords here.)
     EXPECT_FALSE(connection.DoesTableExist("logins"));
     EXPECT_TRUE(connection.DoesTableExist("meta"));
     EXPECT_TRUE(connection.DoesTableExist("token_service"));
-    EXPECT_TRUE(connection.DoesTableExist("web_app_icons"));
-    EXPECT_TRUE(connection.DoesTableExist("web_apps"));
-    EXPECT_TRUE(connection.DoesTableExist("web_intents"));
-    EXPECT_TRUE(connection.DoesTableExist("web_intents_defaults"));
+    // The web_apps and web_apps_icons tables are obsolete as of version 58.
+    EXPECT_FALSE(connection.DoesTableExist("web_apps"));
+    EXPECT_FALSE(connection.DoesTableExist("web_app_icons"));
+    // The web_intents and web_intents_defaults tables are obsolete as of
+    // version 58.
+    EXPECT_FALSE(connection.DoesTableExist("web_intents"));
+    EXPECT_FALSE(connection.DoesTableExist("web_intents_defaults"));
   }
 }
 
 // Tests that absent Autofill tables do not create any problems when migrating
 // from a DB written by the earliest publicly released version of Chrome.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion20ToCurrent) {
   ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_20.sql")));
 
   // Verify pre-conditions.
   {
@@ skipping 1541 matching lines @@
     // Two columns should have been removed.
     EXPECT_FALSE(connection.DoesColumnExist("keywords",
                                             "autogenerate_keyword"));
     EXPECT_FALSE(connection.DoesColumnExist("keywords", "logo_id"));
 
     // Backup data should have been removed.
     EXPECT_NO_FATAL_FAILURE(CheckNoBackupData(connection, &meta_table));
   }
 }
 
-// Tests that the web_intents and web_intents_defaults tables are
-// modified to include "scheme" columns.
+// Previously, this tested that the web_intents and web_intents_defaults tables
+// were modified to include "scheme" columns. Since the web_intents and
+// web_intents_defaults tables are now obsolete, this test checks to ensure that
+// they are properly removed.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion45ToCurrent) {
   ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_45.sql")));
 
   // Verify pre-conditions.  These are expectations for version 45 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
@@ skipping 16 matching lines @@
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     sql::MetaTable meta_table;
     ASSERT_TRUE(meta_table.Init(
         &connection,
         kCurrentTestedVersionNumber,
         kCurrentTestedVersionNumber));
 
-    // A new "scheme" column should have been added to each web_intents table.
-    EXPECT_TRUE(connection.DoesColumnExist("web_intents", "scheme"));
-    EXPECT_TRUE(connection.DoesColumnExist("web_intents_defaults", "scheme"));
-
-    // Verify existing user data was copied.
-    sql::Statement s1(
-        connection.GetUniqueStatement("SELECT * FROM web_intents"));
-
-    ASSERT_TRUE(s1.Step());
-    EXPECT_EQ("http://poodles.com/fuzzer", s1.ColumnString(0));
-    EXPECT_EQ(ASCIIToUTF16("fuzz"), s1.ColumnString16(1));
-    EXPECT_EQ(ASCIIToUTF16("poodle/*"), s1.ColumnString16(2));
-    EXPECT_EQ(ASCIIToUTF16("Poodle Fuzzer"), s1.ColumnString16(3));
-    EXPECT_EQ(ASCIIToUTF16("window"), s1.ColumnString16(4));
-    EXPECT_EQ(ASCIIToUTF16(""), s1.ColumnString16(5));
-    ASSERT_FALSE(s1.Step());
-
-    // Now we want to verify existing user data was copied
-    sql::Statement s2(
-        connection.GetUniqueStatement("SELECT * FROM web_intents_defaults"));
-
-    ASSERT_TRUE(s2.Step());
-    EXPECT_EQ("fuzz", s2.ColumnString(0));
-    EXPECT_EQ(ASCIIToUTF16("poodle/*"), s2.ColumnString16(1));
-    EXPECT_EQ(ASCIIToUTF16(""), s2.ColumnString16(2));
-    EXPECT_EQ(0, s2.ColumnInt(3));
-    EXPECT_EQ(0, s2.ColumnInt(4));
-    EXPECT_EQ(ASCIIToUTF16("http://poodles.com/fuzzer"), s2.ColumnString16(5));
-    EXPECT_EQ(ASCIIToUTF16(""), s2.ColumnString16(6));
-    ASSERT_FALSE(s2.Step());
-
     // finally ensure the migration code cleaned up after itself
-    EXPECT_FALSE(connection.DoesTableExist("old_web_intents"));
-    EXPECT_FALSE(connection.DoesTableExist("old_web_intents_defaults"));
+    EXPECT_FALSE(connection.DoesTableExist("web_intents"));
+    EXPECT_FALSE(connection.DoesTableExist("web_intents_defaults"));
   }
 }
 
-// Tests that the web_intents and web_intents_defaults tables are
-// modified to include "scheme" columns.
+// Previously, this tested that the web_intents and web_intents_defaults tables
+// were modified to include "scheme" columns. Since the web_intents and
+// web_intents_defaults tables are now obsolete, this test checks to ensure that
+// they are properly removed.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion45InvalidToCurrent) {
   ASSERT_NO_FATAL_FAILURE(
       LoadDatabase(FILE_PATH_LITERAL("version_45_invalid.sql")));
 
   // Verify pre-conditions.  These are expectations for version 45 of the
   // database.
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
@@ skipping 17 matching lines @@
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     sql::MetaTable meta_table;
     ASSERT_TRUE(meta_table.Init(
         &connection,
         kCurrentTestedVersionNumber,
         kCurrentTestedVersionNumber));
 
-    // A new "scheme" column should have been added to each web_intents table.
-    EXPECT_TRUE(connection.DoesColumnExist("web_intents", "scheme"));
-    EXPECT_TRUE(connection.DoesColumnExist("web_intents_defaults", "scheme"));
-
-    // Verify existing user data was copied.
-    sql::Statement s1(
-        connection.GetUniqueStatement("SELECT * FROM web_intents"));
-
-    ASSERT_FALSE(s1.Step());  // Basically should be empty at this point.
-
-    // Now we want to verify existing user data was copied
-    sql::Statement s2(
-        connection.GetUniqueStatement("SELECT * FROM web_intents_defaults"));
-
-    // We were able to create the new tables, but unable to copy any data
-    // Given the initial bad state of the tables.
-    ASSERT_FALSE(s2.Step());
-
-    // Finally ensure the migration code cleaned up after itself.
-    EXPECT_FALSE(connection.DoesTableExist("old_web_intents"));
-    EXPECT_FALSE(connection.DoesTableExist("old_web_intents_defaults"));
+    EXPECT_FALSE(connection.DoesTableExist("web_intents"));
+    EXPECT_FALSE(connection.DoesTableExist("web_intents_defaults"));
   }
 }
 
 // Check that current version is forced to compatible version before migration,
 // if the former is smaller.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion45CompatibleToCurrent) {
   ASSERT_NO_FATAL_FAILURE(
       LoadDatabase(FILE_PATH_LITERAL("version_45_compatible.sql")));
 
   // Verify pre-conditions.  These are expectations for version 45 of the
@@ skipping 701 matching lines @@
     EXPECT_EQ("B41FE6E0-B13E-2A2A-BF0B-29FCE2C3ADBD", s_names.ColumnString(0));
     EXPECT_EQ(ASCIIToUTF16("Jon"), s_names.ColumnString16(1));
     EXPECT_EQ(base::string16(), s_names.ColumnString16(2));
     EXPECT_EQ(ASCIIToUTF16("Smith"), s_names.ColumnString16(3));
     EXPECT_EQ(base::string16(), s_names.ColumnString16(4));
 
     // No more entries expected.
     ASSERT_FALSE(s_names.Step());
   }
 }
+
+// Tests that migrating from version 57 to version 58 drops the web_intents and
+// web_apps tables.
+TEST_F(WebDatabaseMigrationTest, MigrateVersion57ToCurrent) {
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_57.sql")));
+
+  // Verify pre-conditions. These are expectations for version 57 of the
+  // database.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    EXPECT_TRUE(connection.DoesTableExist("web_apps"));
+    EXPECT_TRUE(connection.DoesTableExist("web_app_icons"));
+    EXPECT_TRUE(connection.DoesTableExist("web_intents"));
+    EXPECT_TRUE(connection.DoesTableExist("web_intents_defaults"));
+  }
+
+  DoMigration();
+
+  // 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));
+
+    EXPECT_FALSE(connection.DoesTableExist("web_apps"));
+    EXPECT_FALSE(connection.DoesTableExist("web_app_icons"));
+    EXPECT_FALSE(connection.DoesTableExist("web_intents"));
+    EXPECT_FALSE(connection.DoesTableExist("web_intents_defaults"));
+  }
+}