Skip to content

GitLab

T
tangled
Commit f78403c6 authored by Sorin Jianu's avatar Sorin Jianu Committed by Commit Bot
Browse files
Options

Fix UpdateCheckerTests. 

Bug: 806145
Change-Id: Ia3348c5f9c1c589d805fb583890169dc38516e39
Reviewed-on: https://chromium-review.googlesource.com/888160Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532095}
parent b91f674a
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 16 deletions
components/update_client/update_checker_unittest.cc
View file @ f78403c6
...@@ -189,12 +189,6 @@ void UpdateCheckerTest::RunThreads() { ...@@ -189,12 +189,6 @@ void UpdateCheckerTest::RunThreads() {
base::RunLoop runloop; base::RunLoop runloop;
quit_closure_ = runloop.QuitClosure(); quit_closure_ = runloop.QuitClosure();
runloop.Run(); runloop.Run();
// Since some tests need to drain currently enqueued tasks such as network
// intercepts on the IO thread, run the threads until they are
// idle. The component updater service won't loop again until the loop count
// is set and the service is started.
scoped_task_environment_.RunUntilIdle();
} }
void UpdateCheckerTest::Quit() { void UpdateCheckerTest::Quit() {
...@@ -569,9 +563,6 @@ TEST_F(UpdateCheckerTest, UpdateCheckLastActive) { ...@@ -569,9 +563,6 @@ TEST_F(UpdateCheckerTest, UpdateCheckLastActive) {
} }
TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) { TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) {
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
IdToComponentPtrMap components; IdToComponentPtrMap components;
...@@ -580,6 +571,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) { ...@@ -580,6 +571,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) {
auto& component = components[kUpdateItemId]; auto& component = components[kUpdateItemId];
auto& crx_component = const_cast<CrxComponent&>(component->crx_component()); auto& crx_component = const_cast<CrxComponent&>(component->crx_component());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -587,9 +580,11 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) { ...@@ -587,9 +580,11 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) {
RunThreads(); RunThreads();
EXPECT_EQ(string::npos, EXPECT_EQ(string::npos,
post_interceptor_->GetRequests()[0].find("intallsource=")); post_interceptor_->GetRequests()[0].find("installsource="));
component->set_on_demand(true); component->set_on_demand(true);
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -601,6 +596,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) { ...@@ -601,6 +596,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) {
component->set_on_demand(false); component->set_on_demand(false);
crx_component.install_source = "webstore"; crx_component.install_source = "webstore";
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -612,6 +609,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) { ...@@ -612,6 +609,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) {
component->set_on_demand(true); component->set_on_demand(true);
crx_component.install_source = "sideload"; crx_component.install_source = "sideload";
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -623,9 +622,6 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) { ...@@ -623,9 +622,6 @@ TEST_F(UpdateCheckerTest, UpdateCheckInstallSource) {
} }
TEST_F(UpdateCheckerTest, ComponentDisabled) { TEST_F(UpdateCheckerTest, ComponentDisabled) {
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
IdToComponentPtrMap components; IdToComponentPtrMap components;
...@@ -634,6 +630,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) { ...@@ -634,6 +630,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) {
auto& component = components[kUpdateItemId]; auto& component = components[kUpdateItemId];
auto& crx_component = const_cast<CrxComponent&>(component->crx_component()); auto& crx_component = const_cast<CrxComponent&>(component->crx_component());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -646,6 +644,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) { ...@@ -646,6 +644,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) {
crx_component.disabled_reasons = std::vector<int>(); crx_component.disabled_reasons = std::vector<int>();
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -657,6 +657,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) { ...@@ -657,6 +657,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) {
post_interceptor_->GetRequests()[1].find("<disabled")); post_interceptor_->GetRequests()[1].find("<disabled"));
crx_component.disabled_reasons = std::vector<int>({0}); crx_component.disabled_reasons = std::vector<int>({0});
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -669,6 +671,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) { ...@@ -669,6 +671,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) {
crx_component.disabled_reasons = std::vector<int>({1}); crx_component.disabled_reasons = std::vector<int>({1});
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -681,6 +685,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) { ...@@ -681,6 +685,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) {
crx_component.disabled_reasons = std::vector<int>({4, 8, 16}); crx_component.disabled_reasons = std::vector<int>({4, 8, 16});
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -697,6 +703,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) { ...@@ -697,6 +703,8 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) {
crx_component.disabled_reasons = std::vector<int>({0, 4, 8, 16}); crx_component.disabled_reasons = std::vector<int>({0, 4, 8, 16});
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -715,9 +723,6 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) { ...@@ -715,9 +723,6 @@ TEST_F(UpdateCheckerTest, ComponentDisabled) {
} }
TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) { TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
config_->SetBrand(""); config_->SetBrand("");
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
...@@ -734,6 +739,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) { ...@@ -734,6 +739,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
EXPECT_FALSE( EXPECT_FALSE(
component->crx_component_.supports_group_policy_enable_component_updates); component->crx_component_.supports_group_policy_enable_component_updates);
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -751,6 +758,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) { ...@@ -751,6 +758,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
component->crx_component_.supports_group_policy_enable_component_updates = component->crx_component_.supports_group_policy_enable_component_updates =
true; true;
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false, std::vector<std::string>{kUpdateItemId}, components, "", false,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -768,6 +777,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) { ...@@ -768,6 +777,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
component->crx_component_.supports_group_policy_enable_component_updates = component->crx_component_.supports_group_policy_enable_component_updates =
false; false;
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", true, std::vector<std::string>{kUpdateItemId}, components, "", true,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
...@@ -785,6 +796,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) { ...@@ -785,6 +796,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
component->crx_component_.supports_group_policy_enable_component_updates = component->crx_component_.supports_group_policy_enable_component_updates =
true; true;
update_checker_ = UpdateChecker::Create(config_, metadata_.get()); update_checker_ = UpdateChecker::Create(config_, metadata_.get());
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
update_checker_->CheckForUpdates( update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", true, std::vector<std::string>{kUpdateItemId}, components, "", true,
base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete, base::BindOnce(&UpdateCheckerTest::UpdateCheckComplete,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment