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

content/browser/appcache/appcache_database_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/appcache/appcache_database.h"
 #include "content/browser/appcache/appcache_entry.h"
 #include "sql/connection.h"
 #include "sql/meta_table.h"
 #include "sql/statement.h"
-#include "sql/test/scoped_error_ignorer.h"
+#include "sql/test/scoped_error_expecter.h"
 #include "sql/test/test_helpers.h"
 #include "sql/transaction.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace {
 
 const base::Time kZeroTime;
 
 }  // namespace
@@ skipping 73 matching lines @@
     EXPECT_TRUE(db.LazyOpen(true));
     EXPECT_TRUE(base::PathExists(kOtherFile));
     EXPECT_TRUE(base::PathExists(kDbFile));
   }
 
   // Break it.
   ASSERT_TRUE(sql::test::CorruptSizeInHeader(kDbFile));
 
   // Reopening will notice the corruption and delete/recreate the directory.
   {
-    sql::ScopedErrorIgnorer ignore_errors;
-    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_CORRUPT);
     AppCacheDatabase db(kDbFile);
     EXPECT_TRUE(db.LazyOpen(true));
     EXPECT_FALSE(base::PathExists(kOtherFile));
     EXPECT_TRUE(base::PathExists(kDbFile));
-    EXPECT_TRUE(ignore_errors.CheckIgnoredErrors());
+    EXPECT_TRUE(expecter.SawExpectedErrors());
   }
 }
 #endif  // NDEBUG
 
 TEST(AppCacheDatabaseTest, WasCorrutionDetected) {
   // Real files on disk for this test too, a corrupt database file.
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   const base::FilePath kDbFile = temp_dir.path().AppendASCII("appcache.db");
 
   // First create a valid db file.
   AppCacheDatabase db(kDbFile);
   EXPECT_TRUE(db.LazyOpen(true));
   EXPECT_TRUE(base::PathExists(kDbFile));
   EXPECT_FALSE(db.was_corruption_detected());
 
   // Break it.
   ASSERT_TRUE(sql::test::CorruptSizeInHeader(kDbFile));
 
   // See the the corruption is detected and reported.
   {
-    sql::ScopedErrorIgnorer ignore_errors;
-    ignore_errors.IgnoreError(SQLITE_CORRUPT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_CORRUPT);
     std::map<GURL, int64_t> usage_map;
     EXPECT_FALSE(db.GetAllOriginUsage(&usage_map));
     EXPECT_TRUE(db.was_corruption_detected());
     EXPECT_TRUE(base::PathExists(kDbFile));
-    EXPECT_TRUE(ignore_errors.CheckIgnoredErrors());
+    EXPECT_TRUE(expecter.SawExpectedErrors());
   }
 }
 
 TEST(AppCacheDatabaseTest, ExperimentalFlags) {
   const char kExperimentFlagsKey[] = "ExperimentFlags";
   std::string kInjectedFlags("exp1,exp2");
 
   // Real files on disk for this test.
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ skipping 22 matching lines @@
     EXPECT_TRUE(flags.empty());
     EXPECT_FALSE(base::PathExists(kOtherFile));
   }
 }
 
 TEST(AppCacheDatabaseTest, EntryRecords) {
   const base::FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  sql::ScopedErrorIgnorer ignore_errors;
+  sql::test::ScopedErrorExpecter expecter;
   // TODO(shess): Suppressing SQLITE_CONSTRAINT because the code
   // expects that and handles the resulting error.  Consider revising
   // the code to use INSERT OR IGNORE (which would not throw
   // SQLITE_CONSTRAINT) and then check ChangeCount() to see if any
   // changes were made.
-  ignore_errors.IgnoreError(SQLITE_CONSTRAINT);
+  expecter.ExpectError(SQLITE_CONSTRAINT);
 
   AppCacheDatabase::EntryRecord entry;
 
   entry.cache_id = 1;
   entry.url = GURL("http://blah/1");
   entry.flags = AppCacheEntry::MASTER;
   entry.response_id = 1;
   entry.response_size = 100;
   EXPECT_TRUE(db.InsertEntry(&entry));
   EXPECT_FALSE(db.InsertEntry(&entry));
@@ skipping 46 matching lines @@
 
   EXPECT_TRUE(db.DeleteEntriesForCache(2));
   EXPECT_TRUE(db.FindEntriesForCache(2, &found));
   EXPECT_TRUE(found.empty());
   found.clear();
 
   EXPECT_TRUE(db.DeleteEntriesForCache(1));
   EXPECT_FALSE(db.AddEntryFlags(GURL("http://blah/1"), 1,
                                 AppCacheEntry::FOREIGN));
 
-  ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  ASSERT_TRUE(expecter.SawExpectedErrors());
 }
 
 TEST(AppCacheDatabaseTest, CacheRecords) {
   const base::FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  sql::ScopedErrorIgnorer ignore_errors;
+  sql::test::ScopedErrorExpecter expecter;
   // TODO(shess): See EntryRecords test.
-  ignore_errors.IgnoreError(SQLITE_CONSTRAINT);
+  expecter.ExpectError(SQLITE_CONSTRAINT);
 
   const AppCacheDatabase::CacheRecord kZeroRecord;
   AppCacheDatabase::CacheRecord record;
   EXPECT_FALSE(db.FindCache(1, &record));
 
   record.cache_id = 1;
   record.group_id = 1;
   record.online_wildcard = true;
   record.update_time = kZeroTime;
   record.cache_size = 100;
@@ skipping 15 matching lines @@
   EXPECT_TRUE(record.online_wildcard);
   EXPECT_TRUE(kZeroTime == record.update_time);
   EXPECT_EQ(100, record.cache_size);
 
   EXPECT_TRUE(db.DeleteCache(1));
   EXPECT_FALSE(db.FindCache(1, &record));
   EXPECT_FALSE(db.FindCacheForGroup(1, &record));
 
   EXPECT_TRUE(db.DeleteCache(1));
 
-  ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  ASSERT_TRUE(expecter.SawExpectedErrors());
 }
 
 TEST(AppCacheDatabaseTest, GroupRecords) {
   const base::FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  sql::ScopedErrorIgnorer ignore_errors;
+  sql::test::ScopedErrorExpecter expecter;
   // TODO(shess): See EntryRecords test.
-  ignore_errors.IgnoreError(SQLITE_CONSTRAINT);
+  expecter.ExpectError(SQLITE_CONSTRAINT);
 
   const GURL kManifestUrl("http://blah/manifest");
   const GURL kOrigin(kManifestUrl.GetOrigin());
   const base::Time kLastAccessTime = base::Time::Now();
   const base::Time kCreationTime =
       kLastAccessTime - base::TimeDelta::FromDays(7);
 
   const AppCacheDatabase::GroupRecord kZeroRecord;
   AppCacheDatabase::GroupRecord record;
   std::vector<AppCacheDatabase::GroupRecord> records;
@@ skipping 100 matching lines @@
   cache_record.online_wildcard = true;
   cache_record.update_time = kZeroTime;
   EXPECT_TRUE(db.InsertCache(&cache_record));
 
   record = kZeroRecord;
   EXPECT_TRUE(db.FindGroupForCache(1, &record));
   EXPECT_EQ(1, record.group_id);
   EXPECT_EQ(kManifest2, record.manifest_url);
   EXPECT_EQ(kOrigin2, record.origin);
 
-  ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  ASSERT_TRUE(expecter.SawExpectedErrors());
 }
 
 TEST(AppCacheDatabaseTest, GroupAccessAndEvictionTimes) {
   const base::FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
   const GURL kManifestUrl("http://blah/manifest");
   const GURL kOrigin(kManifestUrl.GetOrigin());
   const base::Time kDayOne =
@@ skipping 60 matching lines @@
   record = AppCacheDatabase::GroupRecord();
   EXPECT_TRUE(db.FindGroup(1, &record));
   EXPECT_EQ(kDayTwo, record.last_access_time);
 }
 
 TEST(AppCacheDatabaseTest, NamespaceRecords) {
   const base::FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  sql::ScopedErrorIgnorer ignore_errors;
+  sql::test::ScopedErrorExpecter expecter;
   // TODO(shess): See EntryRecords test.
-  ignore_errors.IgnoreError(SQLITE_CONSTRAINT);
+  expecter.ExpectError(SQLITE_CONSTRAINT);
 
   const GURL kFooNameSpace1("http://foo/namespace1");
   const GURL kFooNameSpace2("http://foo/namespace2");
   const GURL kFooFallbackEntry("http://foo/entry");
   const GURL kFooOrigin(kFooNameSpace1.GetOrigin());
   const GURL kBarNameSpace1("http://bar/namespace1");
   const GURL kBarNameSpace2("http://bar/namespace2");
   const GURL kBarFallbackEntry("http://bar/entry");
   const GURL kBarOrigin(kBarNameSpace1.GetOrigin());
 
@@ skipping 85 matching lines @@
   EXPECT_EQ(2U, fallbacks.size());
   EXPECT_TRUE(fallbacks[0].namespace_.is_pattern);
   EXPECT_TRUE(fallbacks[1].namespace_.is_pattern);
 
   fallbacks.clear();
   EXPECT_TRUE(db.FindNamespacesForOrigin(kBarOrigin, &intercepts, &fallbacks));
   EXPECT_EQ(2U, fallbacks.size());
   EXPECT_TRUE(fallbacks[0].namespace_.is_pattern);
   EXPECT_TRUE(fallbacks[1].namespace_.is_pattern);
 
-  ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  ASSERT_TRUE(expecter.SawExpectedErrors());
 }
 
 TEST(AppCacheDatabaseTest, OnlineWhiteListRecords) {
   const base::FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
   const GURL kFooNameSpace1("http://foo/namespace1");
   const GURL kFooNameSpace2("http://foo/namespace2");
   const GURL kBarNameSpace1("http://bar/namespace1");
@@ skipping 34 matching lines @@
   records.clear();
   EXPECT_TRUE(db.FindOnlineWhiteListForCache(1, &records));
   EXPECT_TRUE(records.empty());
 }
 
 TEST(AppCacheDatabaseTest, DeletableResponseIds) {
   const base::FilePath kEmptyPath;
   AppCacheDatabase db(kEmptyPath);
   EXPECT_TRUE(db.LazyOpen(true));
 
-  sql::ScopedErrorIgnorer ignore_errors;
+  sql::test::ScopedErrorExpecter expecter;
   // TODO(shess): See EntryRecords test.
-  ignore_errors.IgnoreError(SQLITE_CONSTRAINT);
+  expecter.ExpectError(SQLITE_CONSTRAINT);
 
   std::vector<int64_t> ids;
 
   EXPECT_TRUE(db.GetDeletableResponseIds(
       &ids, std::numeric_limits<int64_t>::max(), 100));
   EXPECT_TRUE(ids.empty());
   ids.push_back(0);
   EXPECT_TRUE(db.DeleteDeletableResponseIds(ids));
   EXPECT_TRUE(db.InsertDeletableResponseIds(ids));
 
@@ skipping 48 matching lines @@
 
   // Ensure that we can delete from the table.
   EXPECT_TRUE(db.DeleteDeletableResponseIds(ids));
   ids.clear();
   EXPECT_TRUE(db.GetDeletableResponseIds(
       &ids, std::numeric_limits<int64_t>::max(), 100));
   EXPECT_EQ(5U, ids.size());
   for (int i = 0; i < static_cast<int>(ids.size()); ++i)
     EXPECT_EQ(i + 5, ids[i]);
 
-  ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  ASSERT_TRUE(expecter.SawExpectedErrors());
 }
 
 TEST(AppCacheDatabaseTest, OriginUsage) {
   const GURL kManifestUrl("http://blah/manifest");
   const GURL kManifestUrl2("http://blah/manifest2");
   const GURL kOrigin(kManifestUrl.GetOrigin());
   const GURL kOtherOriginManifestUrl("http://other/manifest");
   const GURL kOtherOrigin(kOtherOriginManifestUrl.GetOrigin());
 
   const base::FilePath kEmptyPath;
@@ skipping 530 matching lines @@
   AppCacheDatabase::GroupRecord group;
   EXPECT_TRUE(db.FindGroup(1, &group));
   EXPECT_EQ(kMockTime, group.last_full_update_check_time);
   EXPECT_EQ(kZeroTime, group.first_evictable_error_time);
   EXPECT_TRUE(db.FindGroup(2, &group));
   EXPECT_EQ(kZeroTime, group.last_full_update_check_time);
   EXPECT_EQ(kZeroTime, group.first_evictable_error_time);
 }
 
 }  // namespace content