Chromium Code Reviews| Index: webrtc/base/timeutils_unittest.cc |
| diff --git a/webrtc/base/timeutils_unittest.cc b/webrtc/base/timeutils_unittest.cc |
| index 636c408220d0e7ef1e11afd713883261b1c44532..530cbbcec4cdcf310dea31927578dd4edd04c824 100644 |
| --- a/webrtc/base/timeutils_unittest.cc |
| +++ b/webrtc/base/timeutils_unittest.cc |
| @@ -15,68 +15,18 @@ |
| #include "webrtc/base/timeutils.h" |
| namespace rtc { |
| +typedef int64_t TimeStamp; |
|
pthatcher1
2016/04/11 20:56:59
Why not just search and replace TimeStamp with uin
honghaiz3
2016/04/18 23:39:04
Done.
|
| TEST(TimeTest, TimeInMs) { |
| - uint32_t ts_earlier = Time(); |
| + TimeStamp ts_earlier = Time(); |
| Thread::SleepMs(100); |
| - uint32_t ts_now = Time(); |
| + TimeStamp ts_now = Time(); |
| // Allow for the thread to wakeup ~20ms early. |
| EXPECT_GE(ts_now, ts_earlier + 80); |
| // Make sure the Time is not returning in smaller unit like microseconds. |
| EXPECT_LT(ts_now, ts_earlier + 1000); |
| } |
| -TEST(TimeTest, Comparison) { |
| - // Obtain two different times, in known order |
| - TimeStamp ts_earlier = Time(); |
| - Thread::SleepMs(100); |
| - TimeStamp ts_now = Time(); |
| - EXPECT_NE(ts_earlier, ts_now); |
| - |
| - // Common comparisons |
| - EXPECT_TRUE( TimeIsLaterOrEqual(ts_earlier, ts_now)); |
| - EXPECT_TRUE( TimeIsLater( ts_earlier, ts_now)); |
| - EXPECT_FALSE(TimeIsLaterOrEqual(ts_now, ts_earlier)); |
| - EXPECT_FALSE(TimeIsLater( ts_now, ts_earlier)); |
| - |
| - // Edge cases |
| - EXPECT_TRUE( TimeIsLaterOrEqual(ts_earlier, ts_earlier)); |
| - EXPECT_FALSE(TimeIsLater( ts_earlier, ts_earlier)); |
| - |
| - // Obtain a third time |
| - TimeStamp ts_later = TimeAfter(100); |
| - EXPECT_NE(ts_now, ts_later); |
| - EXPECT_TRUE( TimeIsLater(ts_now, ts_later)); |
| - EXPECT_TRUE( TimeIsLater(ts_earlier, ts_later)); |
| - |
| - // Common comparisons |
| - EXPECT_TRUE( TimeIsBetween(ts_earlier, ts_now, ts_later)); |
| - EXPECT_FALSE(TimeIsBetween(ts_earlier, ts_later, ts_now)); |
| - EXPECT_FALSE(TimeIsBetween(ts_now, ts_earlier, ts_later)); |
| - EXPECT_TRUE( TimeIsBetween(ts_now, ts_later, ts_earlier)); |
| - EXPECT_TRUE( TimeIsBetween(ts_later, ts_earlier, ts_now)); |
| - EXPECT_FALSE(TimeIsBetween(ts_later, ts_now, ts_earlier)); |
| - |
| - // Edge cases |
| - EXPECT_TRUE( TimeIsBetween(ts_earlier, ts_earlier, ts_earlier)); |
| - EXPECT_TRUE( TimeIsBetween(ts_earlier, ts_earlier, ts_later)); |
| - EXPECT_TRUE( TimeIsBetween(ts_earlier, ts_later, ts_later)); |
| - |
| - // Earlier of two times |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_earlier, ts_earlier)); |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_earlier, ts_now)); |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_earlier, ts_later)); |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_now, ts_earlier)); |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_later, ts_earlier)); |
| - |
| - // Later of two times |
| - EXPECT_EQ(ts_earlier, TimeMax(ts_earlier, ts_earlier)); |
| - EXPECT_EQ(ts_now, TimeMax(ts_earlier, ts_now)); |
| - EXPECT_EQ(ts_later, TimeMax(ts_earlier, ts_later)); |
| - EXPECT_EQ(ts_now, TimeMax(ts_now, ts_earlier)); |
| - EXPECT_EQ(ts_later, TimeMax(ts_later, ts_earlier)); |
| -} |
| - |
| TEST(TimeTest, Intervals) { |
| TimeStamp ts_earlier = Time(); |
| TimeStamp ts_later = TimeAfter(500); |
| @@ -100,33 +50,6 @@ TEST(TimeTest, Intervals) { |
| EXPECT_LE(TimeUntil(ts_later), 500); |
| } |
| -TEST(TimeTest, BoundaryComparison) { |
| - // Obtain two different times, in known order |
| - TimeStamp ts_earlier = static_cast<TimeStamp>(-50); |
| - TimeStamp ts_later = ts_earlier + 100; |
| - EXPECT_NE(ts_earlier, ts_later); |
| - |
| - // Common comparisons |
| - EXPECT_TRUE( TimeIsLaterOrEqual(ts_earlier, ts_later)); |
| - EXPECT_TRUE( TimeIsLater( ts_earlier, ts_later)); |
| - EXPECT_FALSE(TimeIsLaterOrEqual(ts_later, ts_earlier)); |
| - EXPECT_FALSE(TimeIsLater( ts_later, ts_earlier)); |
| - |
| - // Earlier of two times |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_earlier, ts_earlier)); |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_earlier, ts_later)); |
| - EXPECT_EQ(ts_earlier, TimeMin(ts_later, ts_earlier)); |
| - |
| - // Later of two times |
| - EXPECT_EQ(ts_earlier, TimeMax(ts_earlier, ts_earlier)); |
| - EXPECT_EQ(ts_later, TimeMax(ts_earlier, ts_later)); |
| - EXPECT_EQ(ts_later, TimeMax(ts_later, ts_earlier)); |
| - |
| - // Interval |
| - EXPECT_EQ(100, TimeDiff(ts_later, ts_earlier)); |
| - EXPECT_EQ(-100, TimeDiff(ts_earlier, ts_later)); |
| -} |
| - |
| TEST(TimeTest, DISABLED_CurrentTmTime) { |
| struct tm tm; |
| int microseconds; |