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

Unified Diff: chrome/installer/setup/setup_install_details_unittest.cc

Issue 2802713002: Enable side-by-side beta and dev channels. (Closed)
Patch Set: add missing test stanza for reland Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/install_unittest.cc ('k') | chrome/installer/util/beacons_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_install_details_unittest.cc
diff --git a/chrome/installer/setup/setup_install_details_unittest.cc b/chrome/installer/setup/setup_install_details_unittest.cc
index 829c29e056b5db7c742d9e4c9fe614c6d0f85aad..76bf3e477e0cbad9ce836410206164c3c54519ef 100644
--- a/chrome/installer/setup/setup_install_details_unittest.cc
+++ b/chrome/installer/setup/setup_install_details_unittest.cc
@@ -73,6 +73,42 @@ constexpr TestData kTestData[] = {
L"beta", // Expect beta channel.
},
{
+ L"setup.exe --chrome-beta", // User-level, secondary SxS beta mode.
+ L"", // New install.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::BETA_INDEX, // Expect SxS beta mode.
+ false, // Expect user-level.
+ L"beta", // Expect beta channel.
+ },
+ {
+ L"setup.exe --chrome-beta", // User-level, secondary SxS beta mode.
+ L"--uninstall --chrome-beta", // Update.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::BETA_INDEX, // Expect SxS beta mode.
+ false, // Expect user-level.
+ L"beta", // Expect beta channel.
+ },
+ {
+ L"setup.exe --chrome-dev", // User-level, secondary SxS dev mode.
+ L"", // New install.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::DEV_INDEX, // Expect SxS dev mode.
+ false, // Expect user-level.
+ L"dev", // Expect dev channel.
+ },
+ {
+ L"setup.exe --chrome-dev", // User-level, secondary SxS dev mode.
+ L"--uninstall --chrome-dev", // Update.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::DEV_INDEX, // Expect SxS dev mode.
+ false, // Expect user-level.
+ L"dev", // Expect dev channel.
+ },
+ {
L"setup.exe --chrome-sxs", // User-level, secondary SxS canary mode.
L"", // New install.
L"", // Unused.
@@ -129,6 +165,46 @@ constexpr TestData kTestData[] = {
true, // Expect system-level.
L"beta", // Expect beta channel.
},
+ {
+ L"setup.exe --system-level --chrome-beta", // User-level, secondary SxS
+ // beta mode.
+ L"", // New install.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::BETA_INDEX, // Expect SxS beta mode.
+ true, // Expect user-level.
+ L"beta", // Expect beta channel.
+ },
+ {
+ L"setup.exe --system-level --chrome-beta", // User-level, secondary SxS
+ // beta mode.
+ L"--uninstall --system-level --chrome-beta", // Update.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::BETA_INDEX, // Expect SxS beta mode.
+ true, // Expect user-level.
+ L"beta", // Expect beta channel.
+ },
+ {
+ L"setup.exe --system-level --chrome-dev", // User-level, secondary SxS
+ // dev mode.
+ L"", // New install.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::DEV_INDEX, // Expect SxS dev mode.
+ true, // Expect user-level.
+ L"dev", // Expect dev channel.
+ },
+ {
+ L"setup.exe --system-level --chrome-dev", // User-level, secondary SxS
+ // dev mode.
+ L"--uninstall --system-level --chrome-dev", // Update.
+ L"", // Unused.
+ L"", // Unused.
+ install_static::DEV_INDEX, // Expect SxS dev mode.
+ true, // Expect user-level.
+ L"dev", // Expect dev channel.
+ },
};
#else // GOOGLE_CHROME_BUILD
constexpr TestData kTestData[] = {
« no previous file with comments | « chrome/installer/setup/install_unittest.cc ('k') | chrome/installer/util/beacons_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698