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

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

Issue 12316097: Added master_preferences to control shortcuts on windows. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 master preferences related methods. 5 // Unit tests for master preferences related methods.
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/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 "{ \n" 51 "{ \n"
52 " \"distribution\": { \n" 52 " \"distribution\": { \n"
53 " \"show_welcome_page\": true,\n" 53 " \"show_welcome_page\": true,\n"
54 " \"import_search_engine\": true,\n" 54 " \"import_search_engine\": true,\n"
55 " \"import_history\": true,\n" 55 " \"import_history\": true,\n"
56 " \"import_bookmarks\": true,\n" 56 " \"import_bookmarks\": true,\n"
57 " \"import_bookmarks_from_file\": \"c:\\\\foo\",\n" 57 " \"import_bookmarks_from_file\": \"c:\\\\foo\",\n"
58 " \"import_home_page\": true,\n" 58 " \"import_home_page\": true,\n"
59 " \"do_not_create_desktop_shortcut\": true,\n" 59 " \"do_not_create_desktop_shortcut\": true,\n"
60 " \"do_not_create_quick_launch_shortcut\": true,\n" 60 " \"do_not_create_quick_launch_shortcut\": true,\n"
61 " \"do_not_create_start_menu_shortcut\": true,\n"
61 " \"do_not_launch_chrome\": true,\n" 62 " \"do_not_launch_chrome\": true,\n"
62 " \"make_chrome_default\": true,\n" 63 " \"make_chrome_default\": true,\n"
63 " \"make_chrome_default_for_user\": true,\n" 64 " \"make_chrome_default_for_user\": true,\n"
64 " \"system_level\": true,\n" 65 " \"system_level\": true,\n"
65 " \"verbose_logging\": true,\n" 66 " \"verbose_logging\": true,\n"
66 " \"require_eula\": true,\n" 67 " \"require_eula\": true,\n"
67 " \"alternate_shortcut_text\": true,\n" 68 " \"alternate_shortcut_text\": true,\n"
68 " \"chrome_shortcut_icon_index\": 1,\n" 69 " \"chrome_shortcut_icon_index\": 1,\n"
69 " \"ping_delay\": 40\n" 70 " \"ping_delay\": 40\n"
70 " },\n" 71 " },\n"
71 " \"blah\": {\n" 72 " \"blah\": {\n"
72 " \"import_history\": false\n" 73 " \"import_history\": false\n"
73 " }\n" 74 " }\n"
74 "} \n"; 75 "} \n";
75 76
76 EXPECT_TRUE(file_util::WriteFile(prefs_file(), text, strlen(text))); 77 EXPECT_TRUE(file_util::WriteFile(prefs_file(), text, strlen(text)));
77 installer::MasterPreferences prefs(prefs_file()); 78 installer::MasterPreferences prefs(prefs_file());
78 EXPECT_TRUE(prefs.read_from_file()); 79 EXPECT_TRUE(prefs.read_from_file());
79 80
80 const char* expected_true[] = { 81 const char* expected_true[] = {
81 installer::master_preferences::kDistroImportSearchPref, 82 installer::master_preferences::kDistroImportSearchPref,
82 installer::master_preferences::kDistroImportHistoryPref, 83 installer::master_preferences::kDistroImportHistoryPref,
83 installer::master_preferences::kDistroImportBookmarksPref, 84 installer::master_preferences::kDistroImportBookmarksPref,
84 installer::master_preferences::kDistroImportHomePagePref, 85 installer::master_preferences::kDistroImportHomePagePref,
85 installer::master_preferences::kDoNotCreateDesktopShortcut, 86 installer::master_preferences::kDoNotCreateDesktopShortcut,
86 installer::master_preferences::kDoNotCreateQuickLaunchShortcut, 87 installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
88 installer::master_preferences::kDoNotCreateStartMenuShortcut,
87 installer::master_preferences::kDoNotLaunchChrome, 89 installer::master_preferences::kDoNotLaunchChrome,
88 installer::master_preferences::kMakeChromeDefault, 90 installer::master_preferences::kMakeChromeDefault,
89 installer::master_preferences::kMakeChromeDefaultForUser, 91 installer::master_preferences::kMakeChromeDefaultForUser,
90 installer::master_preferences::kSystemLevel, 92 installer::master_preferences::kSystemLevel,
91 installer::master_preferences::kVerboseLogging, 93 installer::master_preferences::kVerboseLogging,
92 installer::master_preferences::kRequireEula, 94 installer::master_preferences::kRequireEula,
93 installer::master_preferences::kAltShortcutText, 95 installer::master_preferences::kAltShortcutText,
94 }; 96 };
95 97
96 for (int i = 0; i < arraysize(expected_true); ++i) { 98 for (int i = 0; i < arraysize(expected_true); ++i) {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 "{" 353 "{"
352 " \"distribution\": {" 354 " \"distribution\": {"
353 " \"create_all_shortcuts\": false" 355 " \"create_all_shortcuts\": false"
354 " }" 356 " }"
355 "}"; 357 "}";
356 358
357 installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs); 359 installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs);
358 360
359 bool do_not_create_desktop_shortcut = false; 361 bool do_not_create_desktop_shortcut = false;
360 bool do_not_create_quick_launch_shortcut = false; 362 bool do_not_create_quick_launch_shortcut = false;
363 bool do_not_create_start_menu_shortcut = false;
361 prefs.GetBool( 364 prefs.GetBool(
362 installer::master_preferences::kDoNotCreateDesktopShortcut, 365 installer::master_preferences::kDoNotCreateDesktopShortcut,
363 &do_not_create_desktop_shortcut); 366 &do_not_create_desktop_shortcut);
364 prefs.GetBool( 367 prefs.GetBool(
365 installer::master_preferences::kDoNotCreateQuickLaunchShortcut, 368 installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
366 &do_not_create_quick_launch_shortcut); 369 &do_not_create_quick_launch_shortcut);
370 prefs.GetBool(
371 installer::master_preferences::kDoNotCreateStartMenuShortcut,
372 &do_not_create_start_menu_shortcut);
367 EXPECT_TRUE(do_not_create_desktop_shortcut); 373 EXPECT_TRUE(do_not_create_desktop_shortcut);
368 EXPECT_TRUE(do_not_create_quick_launch_shortcut); 374 EXPECT_TRUE(do_not_create_quick_launch_shortcut);
375 EXPECT_TRUE(do_not_create_start_menu_shortcut);
gab 2013/02/26 20:35:46 Explicitly EXPECT_FALSE here to be explicit that t
Joao da Silva 2013/03/06 19:57:38 Done.
369 } 376 }
370 377
371 TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsTrue) { 378 TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsTrue) {
372 static const char kCreateAllShortcutsFalsePrefs[] = 379 static const char kCreateAllShortcutsFalsePrefs[] =
373 "{" 380 "{"
374 " \"distribution\": {" 381 " \"distribution\": {"
375 " \"create_all_shortcuts\": true" 382 " \"create_all_shortcuts\": true"
376 " }" 383 " }"
377 "}"; 384 "}";
378 385
379 installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs); 386 installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs);
380 387
381 bool do_not_create_desktop_shortcut = false; 388 bool do_not_create_desktop_shortcut = false;
382 bool do_not_create_quick_launch_shortcut = false; 389 bool do_not_create_quick_launch_shortcut = false;
390 bool do_not_create_start_menu_shortcut = false;
383 prefs.GetBool( 391 prefs.GetBool(
384 installer::master_preferences::kDoNotCreateDesktopShortcut, 392 installer::master_preferences::kDoNotCreateDesktopShortcut,
385 &do_not_create_desktop_shortcut); 393 &do_not_create_desktop_shortcut);
386 prefs.GetBool( 394 prefs.GetBool(
387 installer::master_preferences::kDoNotCreateQuickLaunchShortcut, 395 installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
388 &do_not_create_quick_launch_shortcut); 396 &do_not_create_quick_launch_shortcut);
397 prefs.GetBool(
398 installer::master_preferences::kDoNotCreateStartMenuShortcut,
399 &do_not_create_start_menu_shortcut);
389 EXPECT_FALSE(do_not_create_desktop_shortcut); 400 EXPECT_FALSE(do_not_create_desktop_shortcut);
390 EXPECT_FALSE(do_not_create_quick_launch_shortcut); 401 EXPECT_FALSE(do_not_create_quick_launch_shortcut);
402 EXPECT_FALSE(do_not_create_start_menu_shortcut);
391 } 403 }
392 404
393 TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsNotSpecified) { 405 TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsNotSpecified) {
394 static const char kCreateAllShortcutsFalsePrefs[] = 406 static const char kCreateAllShortcutsFalsePrefs[] =
395 "{" 407 "{"
396 " \"distribution\": {" 408 " \"distribution\": {"
397 " \"some_other_pref\": true" 409 " \"some_other_pref\": true"
398 " }" 410 " }"
399 "}"; 411 "}";
400 412
401 installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs); 413 installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs);
402 414
403 bool do_not_create_desktop_shortcut = false; 415 bool do_not_create_desktop_shortcut = false;
404 bool do_not_create_quick_launch_shortcut = false; 416 bool do_not_create_quick_launch_shortcut = false;
417 bool do_not_create_start_menu_shortcut = false;
405 prefs.GetBool( 418 prefs.GetBool(
406 installer::master_preferences::kDoNotCreateDesktopShortcut, 419 installer::master_preferences::kDoNotCreateDesktopShortcut,
407 &do_not_create_desktop_shortcut); 420 &do_not_create_desktop_shortcut);
408 prefs.GetBool( 421 prefs.GetBool(
409 installer::master_preferences::kDoNotCreateQuickLaunchShortcut, 422 installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
410 &do_not_create_quick_launch_shortcut); 423 &do_not_create_quick_launch_shortcut);
424 prefs.GetBool(
425 installer::master_preferences::kDoNotCreateStartMenuShortcut,
426 &do_not_create_start_menu_shortcut);
411 EXPECT_FALSE(do_not_create_desktop_shortcut); 427 EXPECT_FALSE(do_not_create_desktop_shortcut);
412 EXPECT_FALSE(do_not_create_quick_launch_shortcut); 428 EXPECT_FALSE(do_not_create_quick_launch_shortcut);
429 EXPECT_FALSE(do_not_create_start_menu_shortcut);
413 } 430 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698