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

Unified Diff: chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc

Issue 2338733002: Use TestSimpleTaskRunner::HasPendingTask instead of GetPendingTasks().empty() (Closed)
Patch Set: +bluetooth_adapter_win_unittest.cc Created 4 years, 3 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 | « no previous file | chrome/browser/chromeos/policy/status_uploader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
index f18c38a0128c1e921fc9aceb817d6281a7a0601d..bcbc123aaa16a106199d5f0ffa93d0f8be3c4b6f 100644
--- a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
@@ -168,7 +168,7 @@ TEST_F(HeartbeatSchedulerTest, Basic) {
// Just makes sure we can spin up and shutdown the scheduler with
// heartbeats disabled.
settings_helper_.SetBoolean(chromeos::kHeartbeatEnabled, false);
- ASSERT_TRUE(task_runner_->GetPendingTasks().empty());
+ ASSERT_FALSE(task_runner_->HasPendingTask());
}
TEST_F(HeartbeatSchedulerTest, PermanentlyFailedGCMRegistration) {
@@ -179,7 +179,7 @@ TEST_F(HeartbeatSchedulerTest, PermanentlyFailedGCMRegistration) {
kHeartbeatGCMAppID, gcm::GCMClient::GCM_DISABLED);
// There should be no heartbeat tasks pending, because registration failed.
- ASSERT_TRUE(task_runner_->GetPendingTasks().empty());
+ ASSERT_FALSE(task_runner_->HasPendingTask());
}
TEST_F(HeartbeatSchedulerTest, TemporarilyFailedGCMRegistration) {
@@ -195,7 +195,7 @@ TEST_F(HeartbeatSchedulerTest, TemporarilyFailedGCMRegistration) {
gcm_driver_.IgnoreDefaultHeartbeatsInterval();
// Should have a pending task to try registering again.
- ASSERT_FALSE(task_runner_->GetPendingTasks().empty());
+ ASSERT_TRUE(task_runner_->HasPendingTask());
EXPECT_CALL(gcm_driver_, RegisterImpl(kHeartbeatGCMAppID, _));
task_runner_->RunPendingTasks();
testing::Mock::VerifyAndClearExpectations(&gcm_driver_);
@@ -234,7 +234,7 @@ TEST_F(HeartbeatSchedulerTest, ChangeHeartbeatFrequency) {
EXPECT_CALL(gcm_driver_, SendImpl(kHeartbeatGCMAppID, _, IsHeartbeatMsg()))
.WillOnce(SaveArg<2>(&message));
task_runner_->RunPendingTasks();
- EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
+ EXPECT_FALSE(task_runner_->HasPendingTask());
// Complete sending a message - we should queue up the next heartbeat
// even if the previous attempt failed.
@@ -278,7 +278,7 @@ TEST_F(HeartbeatSchedulerTest, DisableHeartbeats) {
// Now disable heartbeats. Should get no more heartbeats sent.
settings_helper_.SetBoolean(chromeos::kHeartbeatEnabled, false);
task_runner_->RunPendingTasks();
- EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
+ EXPECT_FALSE(task_runner_->HasPendingTask());
}
TEST_F(HeartbeatSchedulerTest, CheckMessageContents) {
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/status_uploader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698