Revert 235595 "Revert 235492 "[sql] Recover Favicons v5 database..."

trunk/src/chrome/browser/history/thumbnail_database_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 <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 772 matching lines @@
     EXPECT_TRUE(
         CheckPageHasIcon(&db, kPageUrl2, chrome::FAVICON,
                          kIconUrl2, kLargeSize, sizeof(kBlob2), kBlob2));
   }
 
   // Corrupt the |icon_mapping.page_url| index by deleting an element
   // from the backing table but not the index.
   {
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
-    {
-      sql::Statement statement(
-          raw_db.GetUniqueStatement("PRAGMA integrity_check"));
-      EXPECT_TRUE(statement.Step());
-      ASSERT_EQ("ok", statement.ColumnString(0));
-    }
+    ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
 
     const char kIndexName[] = "icon_mapping_page_url_idx";
     const int idx_root_page = GetRootPage(&raw_db, kIndexName);
     const int page_size = GetPageSize(&raw_db);
     scoped_ptr<char[]> buf(new char[page_size]);
     EXPECT_TRUE(ReadPage(file_name_, idx_root_page, buf.get(), page_size));
 
     {
       const char kDeleteSql[] = "DELETE FROM icon_mapping WHERE page_url = ?";
       sql::Statement statement(raw_db.GetUniqueStatement(kDeleteSql));
       statement.BindString(0, URLDatabase::GURLToDatabaseURL(kPageUrl2));
       EXPECT_TRUE(statement.Run());
     }
     raw_db.Close();
 
     EXPECT_TRUE(WritePage(file_name_, idx_root_page, buf.get(), page_size));
   }
 
   // Database should be corrupt at the SQLite level.
   {
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
-    sql::Statement statement(
-        raw_db.GetUniqueStatement("PRAGMA integrity_check"));
-    EXPECT_TRUE(statement.Step());
-    ASSERT_NE("ok", statement.ColumnString(0));
+    ASSERT_NE("ok", sql::test::IntegrityCheck(&raw_db));
   }
 
   // Open the database and access the corrupt index.
   {
     sql::ScopedErrorIgnorer ignore_errors;
     ignore_errors.IgnoreError(SQLITE_CORRUPT);
     ThumbnailDatabase db;
     ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
 
     // Data for kPageUrl2 was deleted, but the index entry remains,
     // this will throw SQLITE_CORRUPT.  The corruption handler will
     // recover the database and poison the handle, so the outer call
     // fails.
     EXPECT_FALSE(db.GetIconMappingsForPageURL(kPageUrl2, NULL));
 
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
   }
 
   // Check that the database is recovered at the SQLite level.
   {
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
-    sql::Statement statement(
-        raw_db.GetUniqueStatement("PRAGMA integrity_check"));
-    EXPECT_TRUE(statement.Step());
-    EXPECT_EQ("ok", statement.ColumnString(0));
+    ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
 
     // Check that the expected tables exist.
     VerifyTablesAndColumns(&raw_db);
   }
 
   // Database should also be recovered at higher levels.
   {
     ThumbnailDatabase db;
     ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
 
     // Now this fails because there is no mapping.
     EXPECT_FALSE(db.GetIconMappingsForPageURL(kPageUrl2, NULL));
 
     // Other data was retained by recovery.
     EXPECT_TRUE(
         CheckPageHasIcon(&db, kPageUrl1, chrome::FAVICON,
                          kIconUrl1, kLargeSize, sizeof(kBlob1), kBlob1));
   }
 
-  // Corrupt the database again by making the actual file shorter than
-  // the header expects.
-  {
-    int64 db_size = 0;
-    EXPECT_TRUE(file_util::GetFileSize(file_name_, &db_size));
-    {
-      sql::Connection raw_db;
-      EXPECT_TRUE(raw_db.Open(file_name_));
-      EXPECT_TRUE(raw_db.Execute("CREATE TABLE t(x)"));
-    }
-    file_util::ScopedFILE file(file_util::OpenFile(file_name_, "rb+"));
-    ASSERT_TRUE(file.get() != NULL);
-    EXPECT_EQ(0, fseek(file.get(), static_cast<long>(db_size), SEEK_SET));
-    EXPECT_TRUE(file_util::TruncateFile(file.get()));
-  }
+  // Corrupt the database again by adjusting the header.
+  EXPECT_TRUE(sql::test::CorruptSizeInHeader(file_name_));
 
   // Database is unusable at the SQLite level.
   {
     sql::ScopedErrorIgnorer ignore_errors;
     ignore_errors.IgnoreError(SQLITE_CORRUPT);
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
     EXPECT_FALSE(raw_db.IsSQLValid("PRAGMA integrity_check"));
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
   }
@@ skipping 16 matching lines @@
 
 TEST_F(ThumbnailDatabaseTest, Recovery6) {
   // TODO(shess): See comment at top of Recovery test.
   if (!sql::Recovery::FullRecoverySupported())
     return;
 
   // Create an example database without loading into ThumbnailDatabase
   // (which would upgrade it).
   EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "Favicons.v6.sql"));
 
-  // Corrupt the database by making the actual file shorter than the
-  // SQLite header expects.  This form of corruption will cause
-  // immediate failures during Open(), before the migration code runs,
-  // so the version-6 recovery will occur.
-  {
-    int64 db_size = 0;
-    EXPECT_TRUE(file_util::GetFileSize(file_name_, &db_size));
-    {
-      sql::Connection raw_db;
-      EXPECT_TRUE(raw_db.Open(file_name_));
-      EXPECT_TRUE(raw_db.Execute("CREATE TABLE t(x)"));
-    }
-    file_util::ScopedFILE file(file_util::OpenFile(file_name_, "rb+"));
-    ASSERT_TRUE(file.get() != NULL);
-    EXPECT_EQ(0, fseek(file.get(), static_cast<long>(db_size), SEEK_SET));
-    EXPECT_TRUE(file_util::TruncateFile(file.get()));
-  }
+  // Corrupt the database again by adjusting the header.  This form of
+  // corruption will cause immediate failures during Open(), before
+  // the migration code runs, so the version-6 recovery will occur.
+  EXPECT_TRUE(sql::test::CorruptSizeInHeader(file_name_));
 
   // Database is unusable at the SQLite level.
   {
     sql::ScopedErrorIgnorer ignore_errors;
     ignore_errors.IgnoreError(SQLITE_CORRUPT);
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
     EXPECT_FALSE(raw_db.IsSQLValid("PRAGMA integrity_check"));
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
   }
@@ skipping 15 matching lines @@
                          kIconUrl3, kLargeSize, sizeof(kBlob2), kBlob2));
 
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
   }
 
   // Check that the database is recovered at a SQLite level, and that
   // the current schema is in place.
   {
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
-    sql::Statement statement(
-        raw_db.GetUniqueStatement("PRAGMA integrity_check"));
-    EXPECT_TRUE(statement.Step());
-    EXPECT_EQ("ok", statement.ColumnString(0));
+    ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
+
+    // Check that the expected tables exist.
+    VerifyTablesAndColumns(&raw_db);
+  }
+}
+
+TEST_F(ThumbnailDatabaseTest, Recovery5) {
+  // Create an example database without loading into ThumbnailDatabase
+  // (which would upgrade it).
+  EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "Favicons.v5.sql"));
+
+  // Corrupt the database again by adjusting the header.  This form of
+  // corruption will cause immediate failures during Open(), before
+  // the migration code runs, so the version-5 recovery will occur.
+  EXPECT_TRUE(sql::test::CorruptSizeInHeader(file_name_));
+
+  // Database is unusable at the SQLite level.
+  {
+    sql::ScopedErrorIgnorer ignore_errors;
+    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    sql::Connection raw_db;
+    EXPECT_TRUE(raw_db.Open(file_name_));
+    EXPECT_FALSE(raw_db.IsSQLValid("PRAGMA integrity_check"));
+    ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  }
+
+  // Database should be recovered during open.
+  {
+    sql::ScopedErrorIgnorer ignore_errors;
+    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    ThumbnailDatabase db;
+    ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
+
+    // Test that some data is present, copied from
+    // ThumbnailDatabaseTest.Version5 .
+    EXPECT_TRUE(
+        CheckPageHasIcon(&db, kPageUrl3, chrome::FAVICON,
+                         kIconUrl1, gfx::Size(), sizeof(kBlob1), kBlob1));
+    EXPECT_TRUE(
+        CheckPageHasIcon(&db, kPageUrl3, chrome::TOUCH_ICON,
+                         kIconUrl3, gfx::Size(), sizeof(kBlob2), kBlob2));
+
+    ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  }
+
+  // Check that the database is recovered at a SQLite level, and that
+  // the current schema is in place.
+  {
+    sql::Connection raw_db;
+    EXPECT_TRUE(raw_db.Open(file_name_));
+    ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
 
     // Check that the expected tables exist.
     VerifyTablesAndColumns(&raw_db);
   }
 }
 
 // Test that various broken schema found in the wild can be opened
 // successfully, and result in the correct schema.
 TEST_F(ThumbnailDatabaseTest, WildSchema) {
   base::FilePath sql_path;
@@ skipping 16 matching lines @@
     ThumbnailDatabase db;
     ASSERT_EQ(sql::INIT_OK, db.Init(db_path));
 
     // Verify that the resulting schema is correct, whether it
     // involved razing the file or fixing things in place.
     VerifyTablesAndColumns(&db.db_);
   }
 }
 
 }  // namespace history