[sql] sql::ScopedErrorIgnorer rename to sql::test::ScopedErrorExpecter

components/history/core/browser/top_sites_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 <stddef.h>
 
 #include <map>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_database.h"
 #include "components/history/core/test/database_test_utils.h"
 #include "components/history/core/test/thumbnail-inl.h"
 #include "sql/connection.h"
 #include "sql/recovery.h"
-#include "sql/test/scoped_error_ignorer.h"
+#include "sql/test/scoped_error_expecter.h"
 #include "sql/test/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "url/gurl.h"
 
 namespace {
 
 // URL with url_rank 0 in golden files.
 const GURL kUrl0 = GURL("http://www.google.com/");
 
@@ skipping 119 matching lines @@
     return;
 
   // Create an example database.
   EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v1.sql"));
 
   // Corrupt the database by adjusting the header size.
   EXPECT_TRUE(sql::test::CorruptSizeInHeader(file_name_));
 
   // Database is unusable at the SQLite level.
   {
-    sql::ScopedErrorIgnorer ignore_errors;
-    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(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());
+    ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 
   // Corruption should be detected and recovered during Init().
   {
-    sql::ScopedErrorIgnorer ignore_errors;
-    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_CORRUPT);
 
     TopSitesDatabase db;
     ASSERT_TRUE(db.Init(file_name_));
     VerifyTablesAndColumns(db.db_.get());
     VerifyDatabaseEmpty(db.db_.get());
 
-    ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+    ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 }
 
 TEST_F(TopSitesDatabaseTest, Recovery2) {
   // Recovery module only supports some platforms at this time.
   if (!sql::Recovery::FullRecoverySupported())
     return;
 
   // Create an example database.
   EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v2.sql"));
 
   // Corrupt the database 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::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(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());
+    ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 
   // Corruption should be detected and recovered during Init().  After recovery,
   // the Version2 checks should work.
   {
-    sql::ScopedErrorIgnorer ignore_errors;
-    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_CORRUPT);
 
     TopSitesDatabase db;
     ASSERT_TRUE(db.Init(file_name_));
 
     VerifyTablesAndColumns(db.db_.get());
 
     // Basic operational check.
     MostVisitedURLList urls;
     std::map<GURL, Images> thumbnails;
     db.GetPageThumbnails(&urls, &thumbnails);
     ASSERT_EQ(3u, urls.size());
     ASSERT_EQ(3u, thumbnails.size());
     EXPECT_EQ(kUrl0, urls[0].url);  // [0] because of url_rank.
     // kGoogleThumbnail includes nul terminator.
     ASSERT_EQ(sizeof(kGoogleThumbnail) - 1,
               thumbnails[urls[0].url].thumbnail->size());
     EXPECT_TRUE(!memcmp(thumbnails[urls[0].url].thumbnail->front(),
                         kGoogleThumbnail, sizeof(kGoogleThumbnail) - 1));
 
-    ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+    ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 }
 
 TEST_F(TopSitesDatabaseTest, Recovery3) {
   // Recovery module only supports some platforms at this time.
   if (!sql::Recovery::FullRecoverySupported())
     return;
 
   // Create an example database.
   EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v3.sql"));
 
   // Corrupt the database 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::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(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());
+    ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 
   // Corruption should be detected and recovered during Init().
   {
-    sql::ScopedErrorIgnorer ignore_errors;
-    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_CORRUPT);
 
     TopSitesDatabase db;
     ASSERT_TRUE(db.Init(file_name_));
 
     MostVisitedURLList urls;
     std::map<GURL, Images> thumbnails;
     db.GetPageThumbnails(&urls, &thumbnails);
     ASSERT_EQ(3u, urls.size());
     ASSERT_EQ(3u, thumbnails.size());
     EXPECT_EQ(kUrl0, urls[0].url);  // [0] because of url_rank.
     // kGoogleThumbnail includes nul terminator.
     ASSERT_EQ(sizeof(kGoogleThumbnail) - 1,
               thumbnails[urls[0].url].thumbnail->size());
     EXPECT_TRUE(!memcmp(thumbnails[urls[0].url].thumbnail->front(),
                         kGoogleThumbnail, sizeof(kGoogleThumbnail) - 1));
 
-    ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+    ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 
   // Double-check database integrity.
   {
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
     ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
   }
 
   // Corrupt the thumnails.url auto-index by deleting an element from the table
@@ skipping 14 matching lines @@
     EXPECT_TRUE(raw_db.Open(file_name_));
     ASSERT_NE("ok", sql::test::IntegrityCheck(&raw_db));
   }
 
   // Open the database and access the corrupt index.
   {
     TopSitesDatabase db;
     ASSERT_TRUE(db.Init(file_name_));
 
     {
-      sql::ScopedErrorIgnorer ignore_errors;
-      ignore_errors.IgnoreError(SQLITE_CORRUPT);
+      sql::test::ScopedErrorExpecter expecter;
+      expecter.ExpectError(SQLITE_CORRUPT);
 
       // Data for kUrl1 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_EQ(TopSitesDatabase::kRankOfNonExistingURL,
                 db.GetURLRank(MostVisitedURL(kUrl1, base::string16())));
 
-      ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+      ASSERT_TRUE(expecter.SawExpectedErrors());
     }
   }
 
   // Check that the database is recovered at the SQLite level.
   {
     sql::Connection raw_db;
     EXPECT_TRUE(raw_db.Open(file_name_));
     ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
   }
 
@@ skipping 135 matching lines @@
   db.RemoveURL(url2);
 
   db.GetPageThumbnails(&urls, &thumbnails);
   ASSERT_EQ(4u, urls.size());
   ASSERT_EQ(4u, thumbnails.size());
   EXPECT_EQ(mapsUrl, urls[0].url);
   EXPECT_EQ(kUrl0, urls[1].url);
 }
 
 }  // namespace history