-
Notifications
You must be signed in to change notification settings - Fork 887
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use nightly instead of canary on Windows #194
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
301 changes: 301 additions & 0 deletions
301
chromium_src/chrome/install_static/brave_product_install_details_unittest.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,301 @@ | ||
// Copyright 2016 The Chromium Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style license that can be | ||
// found in the LICENSE file. | ||
|
||
#include "chrome/install_static/product_install_details.h" | ||
|
||
#include "base/base_paths.h" | ||
#include "base/files/file_path.h" | ||
#include "base/i18n/case_conversion.h" | ||
#include "base/macros.h" | ||
#include "base/path_service.h" | ||
#include "base/strings/stringprintf.h" | ||
#include "base/test/test_reg_util_win.h" | ||
#include "base/win/registry.h" | ||
#include "base/win/windows_version.h" | ||
#include "chrome/install_static/install_constants.h" | ||
#include "chrome/install_static/install_details.h" | ||
#include "chrome/install_static/install_modes.h" | ||
#include "chrome_elf/nt_registry/nt_registry.h" | ||
#include "testing/gmock/include/gmock/gmock.h" | ||
#include "testing/gtest/include/gtest/gtest.h" | ||
|
||
using ::testing::Eq; | ||
using ::testing::StrEq; | ||
|
||
namespace install_static { | ||
|
||
namespace { | ||
|
||
TEST(ProductInstallDetailsTest, GetInstallSuffix) { | ||
std::wstring suffix; | ||
const std::pair<const wchar_t*, const wchar_t*> kData[] = { | ||
{L"%ls\\Application", L""}, | ||
{L"%ls\\Application\\", L""}, | ||
{L"\\%ls\\Application", L""}, | ||
{L"\\%ls\\Application\\", L""}, | ||
{L"C:\\foo\\%ls\\Application\\foo.exe", L""}, | ||
{L"%ls-Blorf\\Application", L"-Blorf"}, | ||
{L"%ls-Blorf\\Application\\", L"-Blorf"}, | ||
{L"\\%ls-Blorf\\Application", L"-Blorf"}, | ||
{L"\\%ls-Blorf\\Application\\", L"-Blorf"}, | ||
{L"C:\\foo\\%ls-Blorf\\Application\\foo.exe", L"-Blorf"}, | ||
}; | ||
for (const auto& data : kData) { | ||
const std::wstring path = base::StringPrintf(data.first, kProductPathName); | ||
EXPECT_EQ(std::wstring(data.second), GetInstallSuffix(path)) << path; | ||
} | ||
} | ||
|
||
struct TestData { | ||
const wchar_t* path; | ||
InstallConstantIndex index; | ||
bool system_level; | ||
const wchar_t* channel; | ||
}; | ||
|
||
#if defined(OFFICIAL_BUILD) | ||
constexpr TestData kTestData[] = { | ||
{ | ||
L"C:\\Program Files (x86)\\BraveSoftware\\Brave-Browser\\Application" | ||
L"\\brave.exe", | ||
STABLE_INDEX, true, L"", | ||
}, | ||
{ | ||
L"C:\\Users\\user\\AppData\\Local\\BraveSoftware\\Brave-Browser" | ||
L"\\Application\\brave.exe", | ||
STABLE_INDEX, false, L"", | ||
}, | ||
{ | ||
L"C:\\Program Files (x86)\\BraveSoftware\\Brave-Browser-Beta" | ||
L"\\Application\\brave.exe", | ||
BETA_INDEX, true, L"beta", | ||
}, | ||
{ | ||
L"C:\\Users\\user\\AppData\\Local\\BraveSoftware\\Brave-Browser-Beta" | ||
L"\\Application\\brave.exe", | ||
BETA_INDEX, false, L"beta", | ||
}, | ||
{ | ||
L"C:\\Program Files (x86)\\BraveSoftware\\Brave-Browser-Dev" | ||
L"\\Application\\brave.exe", | ||
DEV_INDEX, true, L"dev", | ||
}, | ||
{ | ||
L"C:\\Users\\user\\AppData\\Local\\BraveSoftware\\Brave-Browser-Dev" | ||
L"\\Application\\brave.exe", | ||
DEV_INDEX, false, L"dev", | ||
}, | ||
{ | ||
L"C:\\Users\\user\\AppData\\Local\\BraveSoftware\\Brave-Browser-Nightly" | ||
L"\\Application\\brave.exe", | ||
CANARY_INDEX, false, L"nightly", | ||
}, | ||
{ | ||
L"C:\\Users\\user\\AppData\\Local\\BraveSoftware\\Brave-Browser-Nightly" | ||
L"\\Application\\brave.exe", | ||
CANARY_INDEX, false, L"nightly", | ||
}, | ||
}; | ||
#else // OFFICIAL_BUILD | ||
constexpr TestData kTestData[] = { | ||
{ | ||
L"C:\\Program Files (x86)\\BraveSoftware\\Brave-Browser-Development" | ||
L"\\Application\\brave.exe", | ||
DEVELOPER_INDEX, true, L"", | ||
}, | ||
{ | ||
L"C:\\Users\\user\\AppData\\Local\\BraveSoftware\\Brave-Browser-Development" | ||
L"Application\\brave.exe", | ||
DEVELOPER_INDEX, false, L"", | ||
}, | ||
}; | ||
#endif // !GOOGLE_CHROME_BUILD | ||
|
||
} // namespace | ||
|
||
// Test that MakeProductDetails properly sniffs out an install's details. | ||
class MakeProductDetailsTest : public testing::TestWithParam<TestData> { | ||
protected: | ||
MakeProductDetailsTest() | ||
: test_data_(GetParam()), | ||
root_key_(test_data_.system_level ? HKEY_LOCAL_MACHINE | ||
: HKEY_CURRENT_USER), | ||
nt_root_key_(test_data_.system_level ? nt::HKLM : nt::HKCU) { | ||
} | ||
|
||
~MakeProductDetailsTest() { | ||
nt::SetTestingOverride(nt_root_key_, base::string16()); | ||
} | ||
|
||
void SetUp() override { | ||
base::string16 path; | ||
ASSERT_NO_FATAL_FAILURE( | ||
override_manager_.OverrideRegistry(root_key_, &path)); | ||
nt::SetTestingOverride(nt_root_key_, path); | ||
} | ||
|
||
const TestData& test_data() const { return test_data_; } | ||
|
||
void SetAp(const wchar_t* value) { | ||
ASSERT_THAT(base::win::RegKey(root_key_, GetClientStateKeyPath().c_str(), | ||
KEY_WOW64_32KEY | KEY_SET_VALUE) | ||
.WriteValue(L"ap", value), | ||
Eq(ERROR_SUCCESS)); | ||
} | ||
|
||
void SetCohortName(const wchar_t* value) { | ||
ASSERT_THAT( | ||
base::win::RegKey(root_key_, | ||
GetClientStateKeyPath().append(L"\\cohort").c_str(), | ||
KEY_WOW64_32KEY | KEY_SET_VALUE) | ||
.WriteValue(L"name", value), | ||
Eq(ERROR_SUCCESS)); | ||
} | ||
|
||
private: | ||
// Returns the registry path for the product's ClientState key. | ||
std::wstring GetClientStateKeyPath() { | ||
std::wstring result(L"Software\\"); | ||
if (kUseGoogleUpdateIntegration) { | ||
result.append(L"BraveSoftware\\Update\\ClientState\\"); | ||
result.append(kInstallModes[test_data().index].app_guid); | ||
} else { | ||
result.append(kProductPathName); | ||
} | ||
return result; | ||
} | ||
|
||
registry_util::RegistryOverrideManager override_manager_; | ||
const TestData& test_data_; | ||
HKEY root_key_; | ||
nt::ROOT_KEY nt_root_key_; | ||
|
||
DISALLOW_COPY_AND_ASSIGN(MakeProductDetailsTest); | ||
}; | ||
|
||
// Test that the install mode is sniffed properly based on the path. | ||
TEST_P(MakeProductDetailsTest, Index) { | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
EXPECT_THAT(details->install_mode_index(), Eq(test_data().index)); | ||
} | ||
|
||
// Test that user/system level is sniffed properly based on the path. | ||
TEST_P(MakeProductDetailsTest, SystemLevel) { | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
EXPECT_THAT(details->system_level(), Eq(test_data().system_level)); | ||
} | ||
|
||
// Test that the default channel is sniffed properly based on the path. | ||
TEST_P(MakeProductDetailsTest, DefaultChannel) { | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
EXPECT_THAT(details->channel(), StrEq(test_data().channel)); | ||
} | ||
|
||
// Test that the channel name is properly parsed out of additional parameters. | ||
TEST_P(MakeProductDetailsTest, AdditionalParametersChannels) { | ||
const std::pair<const wchar_t*, const wchar_t*> kApChannels[] = { | ||
// stable | ||
{L"", L""}, | ||
{L"-full", L""}, | ||
{L"x64-stable", L""}, | ||
{L"x64-stable-full", L""}, | ||
{L"baz-x64-stable", L""}, | ||
{L"foo-1.1-beta", L""}, | ||
{L"2.0-beta", L""}, | ||
{L"bar-2.0-dev", L""}, | ||
{L"1.0-dev", L""}, | ||
{L"fuzzy", L""}, | ||
{L"foo", L""}, | ||
{L"-multi-chrome", L""}, // Legacy. | ||
{L"x64-stable-multi-chrome", L""}, // Legacy. | ||
{L"-stage:ensemble_patching-multi-chrome-full", L""}, // Legacy. | ||
{L"-multi-chrome-full", L""}, // Legacy. | ||
// beta | ||
{L"1.1-beta", L"beta"}, | ||
{L"1.1-beta-full", L"beta"}, | ||
{L"x64-beta", L"beta"}, | ||
{L"x64-beta-full", L"beta"}, | ||
{L"1.1-bar", L"beta"}, | ||
{L"1n1-foobar", L"beta"}, | ||
{L"x64-Beta", L"beta"}, | ||
{L"bar-x64-beta", L"beta"}, | ||
// dev | ||
{L"2.0-dev", L"dev"}, | ||
{L"2.0-dev-full", L"dev"}, | ||
{L"x64-dev", L"dev"}, | ||
{L"x64-dev-full", L"dev"}, | ||
{L"2.0-DEV", L"dev"}, | ||
{L"2.0-dev-eloper", L"dev"}, | ||
{L"2.0-doom", L"dev"}, | ||
{L"250-doom", L"dev"}, | ||
}; | ||
|
||
for (const auto& ap_and_channel : kApChannels) { | ||
SetAp(ap_and_channel.first); | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
if (kInstallModes[test_data().index].channel_strategy == | ||
ChannelStrategy::ADDITIONAL_PARAMETERS) { | ||
EXPECT_THAT(details->channel(), StrEq(ap_and_channel.second)); | ||
} else { | ||
// "ap" is ignored for this mode. | ||
EXPECT_THAT(details->channel(), StrEq(test_data().channel)); | ||
} | ||
} | ||
} | ||
|
||
// Test that the "ap" value is cached during initialization. | ||
TEST_P(MakeProductDetailsTest, UpdateAp) { | ||
// This test is only valid for brands that integrate with Google Update. | ||
if (!kUseGoogleUpdateIntegration) | ||
return; | ||
|
||
// With no value in the registry, the ap value should be empty. | ||
{ | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
EXPECT_THAT(details->update_ap(), StrEq(L"")); | ||
} | ||
|
||
// And with a value, it should have ... the value. | ||
static constexpr wchar_t kCrookedMoon[] = L"CrookedMoon"; | ||
SetAp(kCrookedMoon); | ||
{ | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
EXPECT_THAT(details->update_ap(), StrEq(kCrookedMoon)); | ||
} | ||
} | ||
|
||
// Test that the cohort name is cached during initialization. | ||
TEST_P(MakeProductDetailsTest, UpdateCohortName) { | ||
// This test is only valid for brands that integrate with Google Update. | ||
if (!kUseGoogleUpdateIntegration) | ||
return; | ||
|
||
// With no value in the registry, the cohort name should be empty. | ||
{ | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
EXPECT_THAT(details->update_cohort_name(), StrEq(L"")); | ||
} | ||
|
||
// And with a value, it should have ... the value. | ||
static constexpr wchar_t kPhony[] = L"Phony"; | ||
SetCohortName(kPhony); | ||
{ | ||
std::unique_ptr<PrimaryInstallDetails> details( | ||
MakeProductDetails(test_data().path)); | ||
EXPECT_THAT(details->update_cohort_name(), StrEq(kPhony)); | ||
} | ||
} | ||
|
||
INSTANTIATE_TEST_CASE_P(All, | ||
MakeProductDetailsTest, | ||
testing::ValuesIn(kTestData)); | ||
|
||
} // namespace install_static |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -124,21 +124,21 @@ const InstallConstants kInstallModes[] = { | |
sizeof(kInstallModes[0]), | ||
CANARY_INDEX, // The mode for the side-by-side canary channel. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also change this to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
"chrome-sxs", // Install switch. | ||
L"-Canary", // Install suffix. | ||
L"-Nightly", // Install suffix. | ||
L"Canary", // Logo suffix. | ||
L"{C6CB981E-DB30-4876-8639-109F8933582C}", // A distinct app GUID. | ||
L"Brave Canary", // A distinct base_app_name. | ||
L"BraveCanary", // A distinct base_app_id. | ||
L"Brave Nightly", // A distinct base_app_name. | ||
L"BraveNightly", // A distinct base_app_id. | ||
L"BraveSSHTM", // ProgID prefix. | ||
L"Brave Canary HTML Document", // ProgID description. | ||
L"Brave Nightly HTML Document", // ProgID description. | ||
L"{C6CB981E-DB30-4876-8639-109F8933582C}", // Active Setup GUID. | ||
L"{312ABB99-A176-4939-A39F-E8D34EA4D393}", // CommandExecuteImpl CLSID. | ||
{ 0xf2edbc59, | ||
0x7217, | ||
0x4da5, | ||
{ 0xa2, 0x59, 0x3, 0x2, 0xda, 0x6a, 0x0, | ||
0xe1 } }, // Toast activator CLSID. | ||
L"canary", // Forced channel name. | ||
L"nightly", // Forced channel name. | ||
ChannelStrategy::FIXED, | ||
false, // Does not support system-level installs. | ||
false, // Does not support in-product set as default browser UX. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be
!OFFICIAL_BUILD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.