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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/scoped_ptr.h" 8 #include "base/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"
11 #include "chrome/installer/util/create_reg_key_work_item.h" 11 #include "chrome/installer/util/create_reg_key_work_item.h"
12 #include "chrome/installer/util/work_item.h" 12 #include "chrome/installer/util/work_item.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 using base::win::RegKey; 15 using base::win::RegKey;
16 16
17 namespace { 17 namespace {
18 18
19 wchar_t test_root[] = L"TmpTmp"; 19 wchar_t test_root[] = L"TmpTmp";
20 20
21 class CreateRegKeyWorkItemTest : public testing::Test { 21 class CreateRegKeyWorkItemTest : public testing::Test {
22 protected: 22 protected:
23 virtual void SetUp() { 23 virtual void SetUp() {
24 // Create a temporary key for testing 24 // Create a temporary key for testing
25 RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS); 25 RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
26 key.DeleteKey(test_root); 26 key.DeleteKey(test_root);
27 ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, test_root, KEY_READ)); 27 ASSERT_NE(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, test_root, KEY_READ));
28 ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, test_root, KEY_READ)); 28 ASSERT_EQ(ERROR_SUCCESS, key.Create(HKEY_CURRENT_USER, test_root,
29 KEY_READ));
29 } 30 }
30 virtual void TearDown() { 31 virtual void TearDown() {
31 logging::CloseLogFile(); 32 logging::CloseLogFile();
32 // Clean up the temporary key 33 // Clean up the temporary key
33 RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS); 34 RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
34 ASSERT_TRUE(key.DeleteKey(test_root)); 35 ASSERT_EQ(ERROR_SUCCESS, key.DeleteKey(test_root));
35 } 36 }
36 }; 37 };
37 38
38 } // namespace 39 } // namespace
39 40
40 TEST_F(CreateRegKeyWorkItemTest, CreateKey) { 41 TEST_F(CreateRegKeyWorkItemTest, CreateKey) {
41 RegKey key; 42 RegKey key;
42 43
43 FilePath parent_key(test_root); 44 FilePath parent_key(test_root);
44 parent_key = parent_key.AppendASCII("a"); 45 parent_key = parent_key.AppendASCII("a");
45 ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, parent_key.value().c_str(), 46 ASSERT_EQ(ERROR_SUCCESS,
46 KEY_READ)); 47 key.Create(HKEY_CURRENT_USER, parent_key.value().c_str(), KEY_READ));
47 48
48 FilePath top_key_to_create(parent_key); 49 FilePath top_key_to_create(parent_key);
49 top_key_to_create = top_key_to_create.AppendASCII("b"); 50 top_key_to_create = top_key_to_create.AppendASCII("b");
50 51
51 FilePath key_to_create(top_key_to_create); 52 FilePath key_to_create(top_key_to_create);
52 key_to_create = key_to_create.AppendASCII("c"); 53 key_to_create = key_to_create.AppendASCII("c");
53 key_to_create = key_to_create.AppendASCII("d"); 54 key_to_create = key_to_create.AppendASCII("d");
54 55
55 scoped_ptr<CreateRegKeyWorkItem> work_item( 56 scoped_ptr<CreateRegKeyWorkItem> work_item(
56 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER, 57 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER,
57 key_to_create.ToWStringHack())); 58 key_to_create.ToWStringHack()));
58 59
59 EXPECT_TRUE(work_item->Do()); 60 EXPECT_TRUE(work_item->Do());
60 61
61 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), 62 EXPECT_EQ(ERROR_SUCCESS,
62 KEY_READ)); 63 key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
63 64
64 work_item->Rollback(); 65 work_item->Rollback();
65 66
66 // Rollback should delete all the keys up to top_key_to_create. 67 // Rollback should delete all the keys up to top_key_to_create.
67 EXPECT_FALSE(key.Open(HKEY_CURRENT_USER, top_key_to_create.value().c_str(), 68 EXPECT_NE(ERROR_SUCCESS,
68 KEY_READ)); 69 key.Open(HKEY_CURRENT_USER, top_key_to_create.value().c_str(), KEY_READ));
69 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, parent_key.value().c_str(), 70 EXPECT_EQ(ERROR_SUCCESS,
70 KEY_READ)); 71 key.Open(HKEY_CURRENT_USER, parent_key.value().c_str(), KEY_READ));
71 } 72 }
72 73
73 TEST_F(CreateRegKeyWorkItemTest, CreateExistingKey) { 74 TEST_F(CreateRegKeyWorkItemTest, CreateExistingKey) {
74 RegKey key; 75 RegKey key;
75 76
76 FilePath key_to_create(test_root); 77 FilePath key_to_create(test_root);
77 key_to_create = key_to_create.AppendASCII("aa"); 78 key_to_create = key_to_create.AppendASCII("aa");
78 ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, key_to_create.value().c_str(), 79 ASSERT_EQ(ERROR_SUCCESS,
79 KEY_READ)); 80 key.Create(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
80 81
81 scoped_ptr<CreateRegKeyWorkItem> work_item( 82 scoped_ptr<CreateRegKeyWorkItem> work_item(
82 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER, 83 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER,
83 key_to_create.ToWStringHack())); 84 key_to_create.ToWStringHack()));
84 85
85 EXPECT_TRUE(work_item->Do()); 86 EXPECT_TRUE(work_item->Do());
86 87
87 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), 88 EXPECT_EQ(ERROR_SUCCESS,
88 KEY_READ)); 89 key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
89 90
90 work_item->Rollback(); 91 work_item->Rollback();
91 92
92 // Rollback should not remove the key since it exists before 93 // Rollback should not remove the key since it exists before
93 // the CreateRegKeyWorkItem is called. 94 // the CreateRegKeyWorkItem is called.
94 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), 95 EXPECT_EQ(ERROR_SUCCESS,
95 KEY_READ)); 96 key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
96 } 97 }
97 98
98 TEST_F(CreateRegKeyWorkItemTest, CreateSharedKey) { 99 TEST_F(CreateRegKeyWorkItemTest, CreateSharedKey) {
99 RegKey key; 100 RegKey key;
100 FilePath key_to_create_1(test_root); 101 FilePath key_to_create_1(test_root);
101 key_to_create_1 = key_to_create_1.AppendASCII("aaa"); 102 key_to_create_1 = key_to_create_1.AppendASCII("aaa");
102 103
103 FilePath key_to_create_2(key_to_create_1); 104 FilePath key_to_create_2(key_to_create_1);
104 key_to_create_2 = key_to_create_2.AppendASCII("bbb"); 105 key_to_create_2 = key_to_create_2.AppendASCII("bbb");
105 106
106 FilePath key_to_create_3(key_to_create_2); 107 FilePath key_to_create_3(key_to_create_2);
107 key_to_create_3 = key_to_create_3.AppendASCII("ccc"); 108 key_to_create_3 = key_to_create_3.AppendASCII("ccc");
108 109
109 scoped_ptr<CreateRegKeyWorkItem> work_item( 110 scoped_ptr<CreateRegKeyWorkItem> work_item(
110 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER, 111 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER,
111 key_to_create_3.ToWStringHack())); 112 key_to_create_3.ToWStringHack()));
112 113
113 EXPECT_TRUE(work_item->Do()); 114 EXPECT_TRUE(work_item->Do());
114 115
115 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), 116 EXPECT_EQ(ERROR_SUCCESS,
116 KEY_READ)); 117 key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
117 118
118 // Create another key under key_to_create_2 119 // Create another key under key_to_create_2
119 FilePath key_to_create_4(key_to_create_2); 120 FilePath key_to_create_4(key_to_create_2);
120 key_to_create_4 = key_to_create_4.AppendASCII("ddd"); 121 key_to_create_4 = key_to_create_4.AppendASCII("ddd");
121 ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, key_to_create_4.value().c_str(), 122 ASSERT_EQ(ERROR_SUCCESS,
122 KEY_READ)); 123 key.Create(HKEY_CURRENT_USER, key_to_create_4.value().c_str(), KEY_READ));
123 124
124 work_item->Rollback(); 125 work_item->Rollback();
125 126
126 // Rollback should delete key_to_create_3. 127 // Rollback should delete key_to_create_3.
127 EXPECT_FALSE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), 128 EXPECT_NE(ERROR_SUCCESS,
128 KEY_READ)); 129 key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
129 130
130 // Rollback should not delete key_to_create_2 as it is shared. 131 // Rollback should not delete key_to_create_2 as it is shared.
131 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_2.value().c_str(), 132 EXPECT_EQ(ERROR_SUCCESS,
132 KEY_READ)); 133 key.Open(HKEY_CURRENT_USER, key_to_create_2.value().c_str(), KEY_READ));
133 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_4.value().c_str(), 134 EXPECT_EQ(ERROR_SUCCESS,
134 KEY_READ)); 135 key.Open(HKEY_CURRENT_USER, key_to_create_4.value().c_str(), KEY_READ));
135 } 136 }
136 137
137 TEST_F(CreateRegKeyWorkItemTest, RollbackWithMissingKey) { 138 TEST_F(CreateRegKeyWorkItemTest, RollbackWithMissingKey) {
138 RegKey key; 139 RegKey key;
139 FilePath key_to_create_1(test_root); 140 FilePath key_to_create_1(test_root);
140 key_to_create_1 = key_to_create_1.AppendASCII("aaaa"); 141 key_to_create_1 = key_to_create_1.AppendASCII("aaaa");
141 142
142 FilePath key_to_create_2(key_to_create_1); 143 FilePath key_to_create_2(key_to_create_1);
143 key_to_create_2 = key_to_create_2.AppendASCII("bbbb"); 144 key_to_create_2 = key_to_create_2.AppendASCII("bbbb");
144 145
145 FilePath key_to_create_3(key_to_create_2); 146 FilePath key_to_create_3(key_to_create_2);
146 key_to_create_3 = key_to_create_3.AppendASCII("cccc"); 147 key_to_create_3 = key_to_create_3.AppendASCII("cccc");
147 148
148 scoped_ptr<CreateRegKeyWorkItem> work_item( 149 scoped_ptr<CreateRegKeyWorkItem> work_item(
149 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER, 150 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER,
150 key_to_create_3.ToWStringHack())); 151 key_to_create_3.ToWStringHack()));
151 152
152 EXPECT_TRUE(work_item->Do()); 153 EXPECT_TRUE(work_item->Do());
153 154
154 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), 155 EXPECT_EQ(ERROR_SUCCESS,
155 KEY_READ)); 156 key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
156 key.Close(); 157 key.Close();
157 158
158 // now delete key_to_create_3 159 // now delete key_to_create_3
159 ASSERT_TRUE(RegDeleteKey(HKEY_CURRENT_USER, 160 ASSERT_EQ(ERROR_SUCCESS,
160 key_to_create_3.value().c_str()) == ERROR_SUCCESS); 161 RegDeleteKey(HKEY_CURRENT_USER, key_to_create_3.value().c_str()));
161 ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), 162 ASSERT_NE(ERROR_SUCCESS,
162 KEY_READ)); 163 key.Open(HKEY_CURRENT_USER, key_to_create_3.value().c_str(), KEY_READ));
163 164
164 work_item->Rollback(); 165 work_item->Rollback();
165 166
166 // key_to_create_3 has already been deleted, Rollback should delete 167 // key_to_create_3 has already been deleted, Rollback should delete
167 // the rest. 168 // the rest.
168 ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, key_to_create_1.value().c_str(), 169 ASSERT_NE(ERROR_SUCCESS,
169 KEY_READ)); 170 key.Open(HKEY_CURRENT_USER, key_to_create_1.value().c_str(), KEY_READ));
170 } 171 }
171 172
172 TEST_F(CreateRegKeyWorkItemTest, RollbackWithSetValue) { 173 TEST_F(CreateRegKeyWorkItemTest, RollbackWithSetValue) {
173 RegKey key; 174 RegKey key;
174 175
175 FilePath key_to_create(test_root); 176 FilePath key_to_create(test_root);
176 key_to_create = key_to_create.AppendASCII("aaaaa"); 177 key_to_create = key_to_create.AppendASCII("aaaaa");
177 178
178 scoped_ptr<CreateRegKeyWorkItem> work_item( 179 scoped_ptr<CreateRegKeyWorkItem> work_item(
179 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER, 180 WorkItem::CreateCreateRegKeyWorkItem(HKEY_CURRENT_USER,
180 key_to_create.ToWStringHack())); 181 key_to_create.ToWStringHack()));
181 182
182 EXPECT_TRUE(work_item->Do()); 183 EXPECT_TRUE(work_item->Do());
183 184
184 // Write a value under the key we just created. 185 // Write a value under the key we just created.
185 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), 186 EXPECT_EQ(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER,
186 KEY_READ | KEY_SET_VALUE)); 187 key_to_create.value().c_str(), KEY_READ | KEY_SET_VALUE));
187 EXPECT_TRUE(key.WriteValue(L"name", L"value")); 188 EXPECT_EQ(ERROR_SUCCESS, key.WriteValue(L"name", L"value"));
188 key.Close(); 189 key.Close();
189 190
190 work_item->Rollback(); 191 work_item->Rollback();
191 192
192 // Rollback should not remove the key. 193 // Rollback should not remove the key.
193 EXPECT_TRUE(key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), 194 EXPECT_EQ(ERROR_SUCCESS,
194 KEY_READ)); 195 key.Open(HKEY_CURRENT_USER, key_to_create.value().c_str(), KEY_READ));
195 } 196 }
OLDNEW
« no previous file with comments | « chrome/installer/util/create_reg_key_work_item.cc ('k') | chrome/installer/util/delete_after_reboot_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698