Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1435)

Unified Diff: chrome/browser/extensions/activity_log/activity_database_unittest.cc

Issue 14774012: Replaced enum strings with ints in Activity Log database (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing Singleton dep Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/activity_log/activity_database_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
index 8d73398c5220a459eb264383f562b6cf2ca4ed86..4006d6ee93f18949dd44ec0b46c53d1948ce08af 100644
--- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
@@ -131,7 +131,7 @@ TEST_F(ActivityDatabaseTest, RecordAPIAction) {
sql::Statement statement(db.GetUniqueStatement(sql_str.c_str()));
ASSERT_TRUE(statement.Step());
ASSERT_EQ("punky", statement.ColumnString(0));
- ASSERT_EQ("CALL", statement.ColumnString(2));
+ ASSERT_EQ(0, statement.ColumnInt(2));
ASSERT_EQ("brewster", statement.ColumnString(3));
ASSERT_EQ("woof", statement.ColumnString(4));
}
@@ -168,7 +168,7 @@ TEST_F(ActivityDatabaseTest, RecordBlockedAction) {
ASSERT_EQ("punky", statement.ColumnString(0));
ASSERT_EQ("do.evilThings", statement.ColumnString(2));
ASSERT_EQ("1, 2", statement.ColumnString(3));
- ASSERT_EQ("access denied", statement.ColumnString(4));
+ ASSERT_EQ(1, statement.ColumnInt(4));
ASSERT_EQ("extra", statement.ColumnString(5));
}
@@ -222,7 +222,7 @@ TEST_F(ActivityDatabaseTest, GetTodaysActions) {
// Read them back
std::string api_print = "ID: punky, CATEGORY: CALL, "
"API: brewster, ARGS: woof";
- std::string dom_print = "DOM API CALL: lets, ARGS: vamoose";
+ std::string dom_print = "DOM API CALL: lets, ARGS: vamoose, VERB: MODIFIED";
scoped_ptr<std::vector<scoped_refptr<Action> > > actions =
activity_db->GetActions("punky", 0);
ASSERT_EQ(2, static_cast<int>(actions->size()));
@@ -293,7 +293,7 @@ TEST_F(ActivityDatabaseTest, GetOlderActions) {
// Read them back
std::string api_print = "ID: punky, CATEGORY: CALL, "
"API: brewster, ARGS: woof";
- std::string dom_print = "DOM API CALL: lets, ARGS: vamoose";
+ std::string dom_print = "DOM API CALL: lets, ARGS: vamoose, VERB: MODIFIED";
scoped_ptr<std::vector<scoped_refptr<Action> > > actions =
activity_db->GetActions("punky", 3);
ASSERT_EQ(2, static_cast<int>(actions->size()));
« no previous file with comments | « chrome/browser/extensions/activity_log/activity_actions.cc ('k') | chrome/browser/extensions/activity_log/api_actions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698