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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/installer/util/delete_reg_value_work_item_unittest.cc

Issue 8337006: base/win: small improvement to RegKey API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: apply grt comments Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/background/background_mode_manager_win.cc ('k') | chrome/installer/util/google_update_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <windows.h> 5 #include <windows.h>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/win/registry.h" 10 #include "base/win/registry.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 64 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key,
65 name_dword)); 65 name_dword));
66 scoped_ptr<DeleteRegValueWorkItem> work_item3( 66 scoped_ptr<DeleteRegValueWorkItem> work_item3(
67 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 67 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key,
68 name_empty)); 68 name_empty));
69 69
70 EXPECT_TRUE(work_item1->Do()); 70 EXPECT_TRUE(work_item1->Do());
71 EXPECT_TRUE(work_item2->Do()); 71 EXPECT_TRUE(work_item2->Do());
72 EXPECT_TRUE(work_item3->Do()); 72 EXPECT_TRUE(work_item3->Do());
73 73
74 EXPECT_FALSE(key.ValueExists(name_str.c_str())); 74 EXPECT_FALSE(key.HasValue(name_str.c_str()));
75 EXPECT_FALSE(key.ValueExists(name_dword.c_str())); 75 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
76 EXPECT_FALSE(key.ValueExists(name_empty.c_str())); 76 EXPECT_FALSE(key.HasValue(name_empty.c_str()));
77 77
78 work_item1->Rollback(); 78 work_item1->Rollback();
79 work_item2->Rollback(); 79 work_item2->Rollback();
80 work_item3->Rollback(); 80 work_item3->Rollback();
81 81
82 std::wstring read_str; 82 std::wstring read_str;
83 DWORD read_dword; 83 DWORD read_dword;
84 EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name_str.c_str(), &read_str)); 84 EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name_str.c_str(), &read_str));
85 EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name_dword.c_str(), &read_dword)); 85 EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name_dword.c_str(), &read_dword));
86 EXPECT_EQ(read_str, data_str); 86 EXPECT_EQ(read_str, data_str);
(...skipping 10 matching lines...) Expand all
97 97
98 // Try deleting a value that doesn't exist. 98 // Try deleting a value that doesn't exist.
99 TEST_F(DeleteRegValueWorkItemTest, DeleteNonExistentValue) { 99 TEST_F(DeleteRegValueWorkItemTest, DeleteNonExistentValue) {
100 RegKey key; 100 RegKey key;
101 std::wstring parent_key(test_root); 101 std::wstring parent_key(test_root);
102 file_util::AppendToPath(&parent_key, L"WriteNew"); 102 file_util::AppendToPath(&parent_key, L"WriteNew");
103 ASSERT_EQ(ERROR_SUCCESS, 103 ASSERT_EQ(ERROR_SUCCESS,
104 key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE)); 104 key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE));
105 std::wstring name_str(L"name_str"); 105 std::wstring name_str(L"name_str");
106 std::wstring name_dword(L"name_dword"); 106 std::wstring name_dword(L"name_dword");
107 EXPECT_FALSE(key.ValueExists(name_str.c_str())); 107 EXPECT_FALSE(key.HasValue(name_str.c_str()));
108 EXPECT_FALSE(key.ValueExists(name_dword.c_str())); 108 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
109 109
110 scoped_ptr<DeleteRegValueWorkItem> work_item1( 110 scoped_ptr<DeleteRegValueWorkItem> work_item1(
111 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 111 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key,
112 name_str)); 112 name_str));
113 scoped_ptr<DeleteRegValueWorkItem> work_item2( 113 scoped_ptr<DeleteRegValueWorkItem> work_item2(
114 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 114 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key,
115 name_dword)); 115 name_dword));
116 116
117 EXPECT_TRUE(work_item1->Do()); 117 EXPECT_TRUE(work_item1->Do());
118 EXPECT_TRUE(work_item2->Do()); 118 EXPECT_TRUE(work_item2->Do());
119 119
120 EXPECT_FALSE(key.ValueExists(name_str.c_str())); 120 EXPECT_FALSE(key.HasValue(name_str.c_str()));
121 EXPECT_FALSE(key.ValueExists(name_dword.c_str())); 121 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
122 122
123 work_item1->Rollback(); 123 work_item1->Rollback();
124 work_item2->Rollback(); 124 work_item2->Rollback();
125 125
126 EXPECT_FALSE(key.ValueExists(name_str.c_str())); 126 EXPECT_FALSE(key.HasValue(name_str.c_str()));
127 EXPECT_FALSE(key.ValueExists(name_dword.c_str())); 127 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
128 } 128 }
OLDNEW
« no previous file with comments | « chrome/browser/background/background_mode_manager_win.cc ('k') | chrome/installer/util/google_update_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698