Index: base/win/registry_unittest.cc |
=================================================================== |
--- base/win/registry_unittest.cc (revision 70414) |
+++ base/win/registry_unittest.cc (working copy) |
@@ -21,14 +21,14 @@ |
// Create a temporary key. |
RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS); |
key.DeleteKey(kRootKey); |
- ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, kRootKey, KEY_READ)); |
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, kRootKey, KEY_READ)); |
+ ASSERT_NE(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, kRootKey, KEY_READ)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.Create(HKEY_CURRENT_USER, kRootKey, KEY_READ)); |
} |
virtual void TearDown() { |
// Clean up the temporary key. |
RegKey key(HKEY_CURRENT_USER, L"", KEY_SET_VALUE); |
- ASSERT_TRUE(key.DeleteKey(kRootKey)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.DeleteKey(kRootKey)); |
} |
private: |
@@ -40,22 +40,23 @@ |
std::wstring foo_key(kRootKey); |
foo_key += L"\\Foo"; |
- ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, foo_key.c_str(), KEY_READ)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.Create(HKEY_CURRENT_USER, foo_key.c_str(), |
+ KEY_READ)); |
{ |
- ASSERT_TRUE(key.Open(HKEY_CURRENT_USER, foo_key.c_str(), |
- KEY_READ | KEY_SET_VALUE)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, foo_key.c_str(), |
+ KEY_READ | KEY_SET_VALUE)); |
const wchar_t* kName = L"Bar"; |
const wchar_t* kValue = L"bar"; |
- EXPECT_TRUE(key.WriteValue(kName, kValue)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(kName, kValue)); |
EXPECT_TRUE(key.ValueExists(kName)); |
std::wstring out_value; |
- EXPECT_TRUE(key.ReadValue(kName, &out_value)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.ReadValue(kName, &out_value)); |
EXPECT_NE(out_value, L""); |
EXPECT_STREQ(out_value.c_str(), kValue); |
EXPECT_EQ(1U, key.ValueCount()); |
- EXPECT_TRUE(key.DeleteValue(kName)); |
+ ASSERT_EQ(ERROR_SUCCESS, key.DeleteValue(kName)); |
} |
} |