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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ceee/ie/common/ceee_module_util_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
« ceee/ie/common/ceee_module_util.cc ('K') | « ceee/ie/common/ceee_module_util.cc ('k') | ceee/ie/common/ceee_util.cc » ('j') | ceee/ie/common/ceee_util.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Unit tests for the CEEE module-wide utilities. 5 // Unit tests for the CEEE module-wide utilities.
6 6
7 #include "ceee/ie/common/ceee_module_util.h" 7 #include "ceee/ie/common/ceee_module_util.h"
8 8
9 #include <wtypes.h> 9 #include <wtypes.h>
10 #include <string> 10 #include <string>
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 EXPECT_EQ(L"Software\\Google\\Update\\ClientState\\" 200 EXPECT_EQ(L"Software\\Google\\Update\\ClientState\\"
201 L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}", 201 L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}",
202 ceee_module_util::GetCromeFrameClientStateKey()); 202 ceee_module_util::GetCromeFrameClientStateKey());
203 } 203 }
204 204
205 TEST_F(CeeeModuleUtilTest, GetCollectStatsConsentFromHkcu) { 205 TEST_F(CeeeModuleUtilTest, GetCollectStatsConsentFromHkcu) {
206 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 206 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
207 base::win::RegKey hkcu(HKEY_CURRENT_USER, 207 base::win::RegKey hkcu(HKEY_CURRENT_USER,
208 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE); 208 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE);
209 209
210 ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kTrue)); 210 ASSERT_EQ(ERROR_SUCCESS,
211 hkcu.WriteValue(google_update::kRegUsageStatsField, kTrue));
211 EXPECT_TRUE(ceee_module_util::GetCollectStatsConsent()); 212 EXPECT_TRUE(ceee_module_util::GetCollectStatsConsent());
212 213
213 ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse)); 214 ASSERT_EQ(ERROR_SUCCESS,
215 hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse));
214 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 216 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
215 217
216 ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kInvalid)); 218 ASSERT_EQ(ERROR_SUCCESS,
219 hkcu.WriteValue(google_update::kRegUsageStatsField, kInvalid));
217 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 220 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
218 221
219 ASSERT_TRUE(hkcu.DeleteValue(google_update::kRegUsageStatsField)); 222 ASSERT_EQ(ERROR_SUCCESS,
223 hkcu.DeleteValue(google_update::kRegUsageStatsField));
220 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 224 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
221 } 225 }
222 226
223 TEST_F(CeeeModuleUtilTest, GetCollectStatsConsentFromHklm) { 227 TEST_F(CeeeModuleUtilTest, GetCollectStatsConsentFromHklm) {
224 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 228 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
225 base::win::RegKey hklm(HKEY_LOCAL_MACHINE, 229 base::win::RegKey hklm(HKEY_LOCAL_MACHINE,
226 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE); 230 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE);
227 231
228 ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kTrue)); 232 ASSERT_EQ(ERROR_SUCCESS,
233 hklm.WriteValue(google_update::kRegUsageStatsField, kTrue));
229 EXPECT_TRUE(ceee_module_util::GetCollectStatsConsent()); 234 EXPECT_TRUE(ceee_module_util::GetCollectStatsConsent());
230 235
231 ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kFalse)); 236 ASSERT_EQ(ERROR_SUCCESS,
237 hklm.WriteValue(google_update::kRegUsageStatsField, kFalse));
232 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 238 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
233 239
234 ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kInvalid)); 240 ASSERT_EQ(ERROR_SUCCESS,
241 hklm.WriteValue(google_update::kRegUsageStatsField, kInvalid));
235 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 242 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
236 243
237 ASSERT_TRUE(hklm.DeleteValue(google_update::kRegUsageStatsField)); 244 ASSERT_EQ(ERROR_SUCCESS,
245 hklm.DeleteValue(google_update::kRegUsageStatsField));
238 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 246 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
239 } 247 }
240 248
241 TEST_F(CeeeModuleUtilTest, GetCollectStatsConsentHkcuBeforeHklm) { 249 TEST_F(CeeeModuleUtilTest, GetCollectStatsConsentHkcuBeforeHklm) {
242 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 250 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
243 base::win::RegKey hkcu(HKEY_CURRENT_USER, 251 base::win::RegKey hkcu(HKEY_CURRENT_USER,
244 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE); 252 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE);
245 253
246 base::win::RegKey hklm(HKEY_LOCAL_MACHINE, 254 base::win::RegKey hklm(HKEY_LOCAL_MACHINE,
247 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE); 255 ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE);
248 256
249 ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kTrue)); 257 ASSERT_EQ(ERROR_SUCCESS,
258 hklm.WriteValue(google_update::kRegUsageStatsField, kTrue));
250 ASSERT_TRUE(ceee_module_util::GetCollectStatsConsent()); 259 ASSERT_TRUE(ceee_module_util::GetCollectStatsConsent());
251 260
252 ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse)); 261 ASSERT_EQ(ERROR_SUCCESS,
262 hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse));
253 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent()); 263 EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
254 264
255 ASSERT_TRUE(hkcu.DeleteValue(google_update::kRegUsageStatsField)); 265 ASSERT_EQ(ERROR_SUCCESS,
256 ASSERT_TRUE(hklm.DeleteValue(google_update::kRegUsageStatsField)); 266 hkcu.DeleteValue(google_update::kRegUsageStatsField));
267 ASSERT_EQ(ERROR_SUCCESS,
268 hklm.DeleteValue(google_update::kRegUsageStatsField));
257 } 269 }
258 270
259 } // namespace 271 } // namespace
OLDNEW
« ceee/ie/common/ceee_module_util.cc ('K') | « ceee/ie/common/ceee_module_util.cc ('k') | ceee/ie/common/ceee_util.cc » ('j') | ceee/ie/common/ceee_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698