diff options
author | Jordan Bayles <jophba@chromium.org> | 2020-06-02 15:51:31 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-06-03 14:49:40 +0000 |
commit | c9201dd611b0aa8d66fe7ef2749c7ce0c157f0a1 (patch) | |
tree | 35865dd50de7765c9c82abb42c74a7d70a4b8178 /cast/streaming/rtcp_common_unittest.cc | |
parent | 724a60fb10c7042a3e00eb4f1cf25b41b88b0c8b (diff) | |
download | openscreen-c9201dd611b0aa8d66fe7ef2749c7ce0c157f0a1.tar.gz |
Move std::chrono using statements to util/
This patch moves openscreen::<time type> using statements to be part of
a new util/ header, chrono_helpers.h. Some helpful convenience
functions are provided for doing conversions, and a new conversion
method, to_duration, is added to the Clock implementation.
Change-Id: I5a153c4da5266bceea97de0cad00a71a739f71ca
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2222684
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: Ryan Keane <rwkeane@google.com>
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'cast/streaming/rtcp_common_unittest.cc')
-rw-r--r-- | cast/streaming/rtcp_common_unittest.cc | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/cast/streaming/rtcp_common_unittest.cc b/cast/streaming/rtcp_common_unittest.cc index d593e4f0..14aaa7ee 100644 --- a/cast/streaming/rtcp_common_unittest.cc +++ b/cast/streaming/rtcp_common_unittest.cc @@ -10,6 +10,7 @@ #include "absl/types/span.h" #include "gtest/gtest.h" #include "platform/api/time.h" +#include "util/chrono_helpers.h" namespace openscreen { namespace cast { @@ -280,28 +281,23 @@ TEST(RtcpCommonTest, ComputesDelayForReportBlocks) { // A duration less than or equal to zero should clamp to zero. EXPECT_EQ(Delay::zero(), ComputeDelay(Clock::duration::min())); - EXPECT_EQ(Delay::zero(), ComputeDelay(std::chrono::milliseconds(-1234))); + EXPECT_EQ(Delay::zero(), ComputeDelay(milliseconds{-1234})); EXPECT_EQ(Delay::zero(), ComputeDelay(Clock::duration::zero())); // Test conversion of various durations that should not clamp. EXPECT_EQ(Delay(32768 /* 1/2 second worth of ticks */), - ComputeDelay(std::chrono::milliseconds(500))); + ComputeDelay(milliseconds(500))); EXPECT_EQ(Delay(65536 /* 1 second worth of ticks */), - ComputeDelay(std::chrono::seconds(1))); + ComputeDelay(seconds(1))); EXPECT_EQ(Delay(655360 /* 10 seconds worth of ticks */), - ComputeDelay(std::chrono::seconds(10))); - EXPECT_EQ(Delay(4294967294), - ComputeDelay(std::chrono::microseconds(65535999983))); - EXPECT_EQ(Delay(4294967294), - ComputeDelay(std::chrono::microseconds(65535999984))); + ComputeDelay(seconds(10))); + EXPECT_EQ(Delay(4294967294), ComputeDelay(microseconds(65535999983))); + EXPECT_EQ(Delay(4294967294), ComputeDelay(microseconds(65535999984))); // A too-large duration should clamp to the maximum-possible Delay value. - EXPECT_EQ(Delay(4294967295), - ComputeDelay(std::chrono::microseconds(65535999985))); - EXPECT_EQ(Delay(4294967295), - ComputeDelay(std::chrono::microseconds(65535999986))); - EXPECT_EQ(Delay(4294967295), - ComputeDelay(std::chrono::microseconds(999999000000))); + EXPECT_EQ(Delay(4294967295), ComputeDelay(microseconds(65535999985))); + EXPECT_EQ(Delay(4294967295), ComputeDelay(microseconds(65535999986))); + EXPECT_EQ(Delay(4294967295), ComputeDelay(microseconds(999999000000))); EXPECT_EQ(Delay(4294967295), ComputeDelay(Clock::duration::max())); } |