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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/util/create_reg_key_work_item_unittest.cc

Issue 6090006: Regkey functions return error code instead of bool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
« chrome/installer/util/channel_info.cc ('K') | « chrome/installer/util/create_reg_key_work_item.cc ('k') | chrome/installer/util/delete_after_reboot_helper.cc » ('j') | chrome/installer/util/delete_after_reboot_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/create_reg_key_work_item_unittest.cc
===================================================================
--- chrome/installer/util/create_reg_key_work_item_unittest.cc (revision 71561)
+++ chrome/installer/util/create_reg_key_work_item_unittest.cc (working copy)
@@ -24,14 +24,15 @@
// Create a temporary key for testing
RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
key.DeleteKey(test_root);
- ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, test_root, KEY_READ));
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, test_root, KEY_READ));
+ ASSERT_NE(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, test_root, KEY_READ));
+ ASSERT_EQ(ERROR_SUCCESS, key.Create(HKEY_CURRENT_USER, test_root,
+ KEY_READ));
}
virtual void TearDown() {
logging::CloseLogFile();
// Clean up the temporary key
RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
- ASSERT_TRUE(key.DeleteKey(test_root));
+ ASSERT_EQ(ERROR_SUCCESS, key.DeleteKey(test_root));
}
};
@@ -42,8 +43,8 @@
FilePath parent_key(test_root);
parent_key = parent_key.AppendASCII("a");
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, parent_key.value().c_str(),
- KEY_READ));
+ ASSERT_EQ(ERROR_SUCCESS,
+ key.Create(HKEY_CURRENT_USER, parent_key.value().c_str(), KEY_READ));
FilePath top_key_to_create(parent_key);
top_key_to_create = top_key_to_create.AppendASCII("b");
@@ -58,16 +59,16 @@
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(),
- KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
work_item->Rollback();
// Rollback should delete all the keys up to top_key_to_create.
- EXPECT_FALSE(key.Open(HKEY_CURRENT_USER, top_key_to_create.value().c_str(),
- KEY_READ));
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, parent_key.value().c_str(),
- KEY_READ));
+ EXPECT_NE(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, top_key_to_create.value().c_str(), KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, parent_key.value().c_str(), KEY_READ));
}
TEST_F(CreateRegKeyWorkItemTest, CreateExistingKey) {
@@ -75,8 +76,8 @@
FilePath key_to_create(test_root);
key_to_create = key_to_create.AppendASCII("aa");
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, key_to_create.value().c_str(),
- KEY_READ));
+ ASSERT_EQ(ERROR_SUCCESS,
+ key.Create(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
scoped_ptr<CreateRegKeyWorkItem> work_item(
WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER,
@@ -84,15 +85,15 @@
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(),
- KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
work_item->Rollback();
// Rollback should not remove the key since it exists before
// the CreateRegKeyWorkItem is called.
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(),
- KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
}
TEST_F(CreateRegKeyWorkItemTest, CreateSharedKey) {
@@ -112,26 +113,26 @@
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(),
- KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
// Create another key under key_to_create_2
FilePath key_to_create_4(key_to_create_2);
key_to_create_4 = key_to_create_4.AppendASCII("ddd");
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, key_to_create_4.value().c_str(),
- KEY_READ));
+ ASSERT_EQ(ERROR_SUCCESS,
+ key.Create(HKEY_CURRENT_USER, key_to_create_4.value().c_str(), KEY_READ));
work_item->Rollback();
// Rollback should delete key_to_create_3.
- EXPECT_FALSE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(),
- KEY_READ));
+ EXPECT_NE(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
// Rollback should not delete key_to_create_2 as it is shared.
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_2.value().c_str(),
- KEY_READ));
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_4.value().c_str(),
- KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create_2.value().c_str(), KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create_4.value().c_str(), KEY_READ));
}
TEST_F(CreateRegKeyWorkItemTest, RollbackWithMissingKey) {
@@ -151,22 +152,22 @@
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(),
- KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
key.Close();
// now delete key_to_create_3
- ASSERT_TRUE(RegDeleteKey(HKEY_CURRENT_USER,
- key_to_create_3.value().c_str()) == ERROR_SUCCESS);
- ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(),
- KEY_READ));
+ ASSERT_EQ(ERROR_SUCCESS,
+ RegDeleteKey(HKEY_CURRENT_USER, key_to_create_3.value().c_str()));
+ ASSERT_NE(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
work_item->Rollback();
// key_to_create_3 has already been deleted, Rollback should delete
// the rest.
- ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, key_to_create_1.value().c_str(),
- KEY_READ));
+ ASSERT_NE(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create_1.value().c_str(), KEY_READ));
}
TEST_F(CreateRegKeyWorkItemTest, RollbackWithSetValue) {
@@ -182,14 +183,14 @@
EXPECT_TRUE(work_item->Do());
// Write a value under the key we just created.
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(),
- KEY_READ | KEY_SET_VALUE));
- EXPECT_TRUE(key.WriteValue(L"name", L"value"));
+ EXPECT_EQ(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER,
+ key_to_create.value().c_str(), KEY_READ | KEY_SET_VALUE));
+ EXPECT_EQ(ERROR_SUCCESS, key.WriteValue(L"name", L"value"));
key.Close();
work_item->Rollback();
// Rollback should not remove the key.
- EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(),
- KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS,
+ key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
}
« chrome/installer/util/channel_info.cc ('K') | « chrome/installer/util/create_reg_key_work_item.cc ('k') | chrome/installer/util/delete_after_reboot_helper.cc » ('j') | chrome/installer/util/delete_after_reboot_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698