Index: chrome/installer/util/delete_reg_value_work_item_unittest.cc |
=================================================================== |
--- chrome/installer/util/delete_reg_value_work_item_unittest.cc (revision 71345) |
+++ chrome/installer/util/delete_reg_value_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)); |
} |
}; |
@@ -43,21 +44,21 @@ |
RegKey key; |
std::wstring parent_key(test_root); |
file_util::AppendToPath(&parent_key, L"WriteNew"); |
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, parent_key.c_str(), |
- KEY_READ | KEY_WRITE)); |
+ ASSERT_EQ(ERROR_SUCCESS, |
+ key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE)); |
std::wstring name_str(L"name_str"); |
std::wstring data_str(L"data_111"); |
- ASSERT_TRUE(key.WriteValue(name_str.c_str(), data_str.c_str())); |
+ ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name_str.c_str(), data_str.c_str())); |
std::wstring name_dword(L"name_dword"); |
DWORD data_dword = 100; |
- ASSERT_TRUE(key.WriteValue(name_dword.c_str(), data_dword)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name_dword.c_str(), data_dword)); |
scoped_ptr<DeleteRegValueWorkItem> work_item1( |
WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, |
- name_str, REG_SZ)); |
+ name_str)); |
scoped_ptr<DeleteRegValueWorkItem> work_item2( |
WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, |
- name_dword, REG_DWORD)); |
+ name_dword)); |
EXPECT_TRUE(work_item1->Do()); |
EXPECT_TRUE(work_item2->Do()); |
@@ -70,8 +71,8 @@ |
std::wstring read_str; |
DWORD read_dword; |
- EXPECT_TRUE(key.ReadValue(name_str.c_str(), &read_str)); |
- EXPECT_TRUE(key.ReadValueDW(name_dword.c_str(), &read_dword)); |
+ EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name_str.c_str(), &read_str)); |
+ EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name_dword.c_str(), &read_dword)); |
EXPECT_EQ(read_str, data_str); |
EXPECT_EQ(read_dword, data_dword); |
} |
@@ -81,8 +82,8 @@ |
RegKey key; |
std::wstring parent_key(test_root); |
file_util::AppendToPath(&parent_key, L"WriteNew"); |
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, parent_key.c_str(), |
- KEY_READ | KEY_WRITE)); |
+ ASSERT_EQ(ERROR_SUCCESS, |
+ key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE)); |
std::wstring name_str(L"name_str"); |
std::wstring name_dword(L"name_dword"); |
EXPECT_FALSE(key.ValueExists(name_str.c_str())); |
@@ -90,10 +91,10 @@ |
scoped_ptr<DeleteRegValueWorkItem> work_item1( |
WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, |
- name_str, REG_SZ)); |
+ name_str)); |
scoped_ptr<DeleteRegValueWorkItem> work_item2( |
WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, |
- name_dword, REG_DWORD)); |
+ name_dword)); |
EXPECT_TRUE(work_item1->Do()); |
EXPECT_TRUE(work_item2->Do()); |