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

sql/statement_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/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "sql/connection.h"
 #include "sql/correct_sql_test_base.h"
 #include "sql/statement.h"
 #include "sql/test/error_callback_support.h"
-#include "sql/test/scoped_error_ignorer.h"
+#include "sql/test/scoped_error_expecter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace {
 
 using SQLStatementTest = sql::SQLTestBase;
 
 }  // namespace
 
 TEST_F(SQLStatementTest, Assign) {
@@ skipping 46 matching lines @@
   // Insert in the foo table the primary key. It is an error to insert
   // something other than an number. This error causes the error callback
   // handler to be called with SQLITE_MISMATCH as error code.
   sql::Statement s(db().GetUniqueStatement("INSERT INTO foo (a) VALUES (?)"));
   EXPECT_TRUE(s.is_valid());
   s.BindCString(0, "bad bad");
   EXPECT_FALSE(s.Run());
   EXPECT_EQ(SQLITE_MISMATCH, error);
 }
 
-// Error ignorer works for error running a statement.
+// Error expecter works for error running a statement.
 TEST_F(SQLStatementTest, ScopedIgnoreError) {
   ASSERT_TRUE(db().Execute("CREATE TABLE foo (a INTEGER PRIMARY KEY, b)"));
 
   sql::Statement s(db().GetUniqueStatement("INSERT INTO foo (a) VALUES (?)"));
   EXPECT_TRUE(s.is_valid());
 
-  sql::ScopedErrorIgnorer ignore_errors;
-  ignore_errors.IgnoreError(SQLITE_MISMATCH);
-  s.BindCString(0, "bad bad");
-  ASSERT_FALSE(s.Run());
-  ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  {
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_MISMATCH);
+    s.BindCString(0, "bad bad");
+    ASSERT_FALSE(s.Run());
+    ASSERT_TRUE(expecter.SawExpectedErrors());
+  }
 }
 
 TEST_F(SQLStatementTest, Reset) {
   ASSERT_TRUE(db().Execute("CREATE TABLE foo (a, b)"));
   ASSERT_TRUE(db().Execute("INSERT INTO foo (a, b) VALUES (3, 12)"));
   ASSERT_TRUE(db().Execute("INSERT INTO foo (a, b) VALUES (4, 13)"));
 
   sql::Statement s(db().GetUniqueStatement(
       "SELECT b FROM foo WHERE a = ? "));
   s.BindInt(0, 3);
   ASSERT_TRUE(s.Step());
   EXPECT_EQ(12, s.ColumnInt(0));
   ASSERT_FALSE(s.Step());
 
   s.Reset(false);
   // Verify that we can get all rows again.
   ASSERT_TRUE(s.Step());
   EXPECT_EQ(12, s.ColumnInt(0));
   EXPECT_FALSE(s.Step());
 
   s.Reset(true);
   ASSERT_FALSE(s.Step());
 }