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

Unified Diff: net/quic/quic_alarm_test.cc

Issue 1779883005: Remove unused return value from QuicAlarm::Delegate::OnAlarm. No behavior change, not protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@116388439
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_alarm.cc ('k') | net/quic/quic_chromium_connection_helper_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_alarm_test.cc
diff --git a/net/quic/quic_alarm_test.cc b/net/quic/quic_alarm_test.cc
index 0ae645974f1cb6be10d5b79d5669a7c47931773a..0509090e747c17b914fcecc94efe958b1e4c589f 100644
--- a/net/quic/quic_alarm_test.cc
+++ b/net/quic/quic_alarm_test.cc
@@ -17,7 +17,7 @@ namespace {
class MockDelegate : public QuicAlarm::Delegate {
public:
- MOCK_METHOD0(OnAlarm, QuicTime());
+ MOCK_METHOD0(OnAlarm, void());
};
class DestructiveDelegate : public QuicAlarm::Delegate {
@@ -26,10 +26,9 @@ class DestructiveDelegate : public QuicAlarm::Delegate {
void set_alarm(QuicAlarm* alarm) { alarm_ = alarm; }
- QuicTime OnAlarm() override {
+ void OnAlarm() override {
DCHECK(alarm_);
delete alarm_;
- return QuicTime::Zero();
}
private:
@@ -137,28 +136,17 @@ TEST_F(QuicAlarmTest, UpdateWithZero) {
TEST_F(QuicAlarmTest, Fire) {
QuicTime deadline = QuicTime::Zero().Add(QuicTime::Delta::FromSeconds(7));
alarm_.Set(deadline);
- EXPECT_CALL(*delegate_, OnAlarm()).WillOnce(Return(QuicTime::Zero()));
alarm_.FireAlarm();
EXPECT_FALSE(alarm_.IsSet());
EXPECT_FALSE(alarm_.scheduled());
EXPECT_EQ(QuicTime::Zero(), alarm_.deadline());
}
-TEST_F(QuicAlarmTest, FireAndResetViaReturn) {
- alarm_.Set(deadline_);
- EXPECT_CALL(*delegate_, OnAlarm()).WillOnce(Return(deadline2_));
- alarm_.FireAlarm();
- EXPECT_TRUE(alarm_.IsSet());
- EXPECT_TRUE(alarm_.scheduled());
- EXPECT_EQ(deadline2_, alarm_.deadline());
-}
-
TEST_F(QuicAlarmTest, FireAndResetViaSet) {
alarm_.Set(deadline_);
new_deadline_ = deadline2_;
EXPECT_CALL(*delegate_, OnAlarm())
- .WillOnce(DoAll(Invoke(this, &QuicAlarmTest::ResetAlarm),
- Return(QuicTime::Zero())));
+ .WillOnce(Invoke(this, &QuicAlarmTest::ResetAlarm));
alarm_.FireAlarm();
EXPECT_TRUE(alarm_.IsSet());
EXPECT_TRUE(alarm_.scheduled());
« no previous file with comments | « net/quic/quic_alarm.cc ('k') | net/quic/quic_chromium_connection_helper_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698