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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/net/rtcp/rtcp_unittest.cc

Issue 499433002: Minor code redundancy cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 6 years, 4 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 | « media/cast/net/rtcp/rtcp_sender_unittest.cc ('k') | media/cast/net/rtcp/rtcp_utility.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/rtcp/rtcp_unittest.cc
diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc
index d7404093d6772be38d99c4249380f8f32b68f314..baa0699bdd7c40dd3ac046377c21daf6d2b67137 100644
--- a/media/cast/net/rtcp/rtcp_unittest.cc
+++ b/media/cast/net/rtcp/rtcp_unittest.cc
@@ -270,25 +270,13 @@ TEST_F(RtcpTest, RttReducedSizeRtcp) {
base::TimeDelta min_rtt;
base::TimeDelta max_rtt;
EXPECT_FALSE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1, 1, 1);
RunTasks(33);
rtcp_receiver.SendRtcpFromRtpReceiver(NULL, base::TimeDelta(), NULL, &stats_);
EXPECT_TRUE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_NEAR(2 * kAddedDelay, rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, avg_rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 2, 1, 1);
RunTasks(33);
- EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
-
- EXPECT_NEAR(2 * kAddedDelay, rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, avg_rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
}
TEST_F(RtcpTest, Rtt) {
@@ -320,7 +308,6 @@ TEST_F(RtcpTest, Rtt) {
base::TimeDelta min_rtt;
base::TimeDelta max_rtt;
EXPECT_FALSE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1, 1, 1);
RunTasks(33);
@@ -329,7 +316,6 @@ TEST_F(RtcpTest, Rtt) {
EXPECT_TRUE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
RunTasks(33);
- EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
RunTasks(33);
EXPECT_NEAR(2 * kAddedDelay, rtt.InMilliseconds(), 2);
@@ -339,11 +325,6 @@ TEST_F(RtcpTest, Rtt) {
rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 2, 1, 1);
RunTasks(33);
- EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_NEAR(2 * kAddedDelay, rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, avg_rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
receiver_to_sender_.set_short_delay();
sender_to_receiver_.set_short_delay();
@@ -357,13 +338,6 @@ TEST_F(RtcpTest, Rtt) {
rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 3, 1, 1);
RunTasks(33);
- EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_NEAR(2 * kAddedShortDelay, rtt.InMilliseconds(), 1);
- EXPECT_NEAR((2 * kAddedShortDelay + 2 * kAddedDelay) / 2,
- avg_rtt.InMilliseconds(),
- 1);
- EXPECT_NEAR(2 * kAddedShortDelay, min_rtt.InMilliseconds(), 2);
- EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
rtcp_receiver.SendRtcpFromRtpReceiver(NULL, base::TimeDelta(), NULL, &stats_);
EXPECT_TRUE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
@@ -411,11 +385,6 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
base::TimeDelta min_rtt;
base::TimeDelta max_rtt;
EXPECT_FALSE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_NEAR(2 * kAddedDelay, rtt.InMilliseconds(), 1);
- EXPECT_NEAR(2 * kAddedDelay, avg_rtt.InMilliseconds(), 1);
- EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 1);
- EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 1);
receiver_to_sender_.set_short_delay();
sender_to_receiver_.set_short_delay();
@@ -425,8 +394,6 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1, 1, 1);
RunTasks(33);
- EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- EXPECT_NEAR(kAddedDelay + kAddedShortDelay, rtt.InMilliseconds(), 2);
}
TEST_F(RtcpTest, NtpAndTime) {
« no previous file with comments | « media/cast/net/rtcp/rtcp_sender_unittest.cc ('k') | media/cast/net/rtcp/rtcp_utility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698