| Index: webrtc/base/timeutils_unittest.cc
|
| diff --git a/webrtc/base/timeutils_unittest.cc b/webrtc/base/timeutils_unittest.cc
|
| index 636c408220d0e7ef1e11afd713883261b1c44532..61e41b7c644919070ee84822622c9fc4b7807bfd 100644
|
| --- a/webrtc/base/timeutils_unittest.cc
|
| +++ b/webrtc/base/timeutils_unittest.cc
|
| @@ -49,19 +49,6 @@ TEST(TimeTest, Comparison) {
|
| 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));
|
| @@ -127,23 +114,6 @@ TEST(TimeTest, BoundaryComparison) {
|
| EXPECT_EQ(-100, TimeDiff(ts_earlier, ts_later));
|
| }
|
|
|
| -TEST(TimeTest, DISABLED_CurrentTmTime) {
|
| - struct tm tm;
|
| - int microseconds;
|
| -
|
| - time_t before = ::time(NULL);
|
| - CurrentTmTime(&tm, µseconds);
|
| - time_t after = ::time(NULL);
|
| -
|
| - // Assert that 'tm' represents a time between 'before' and 'after'.
|
| - // mktime() uses local time, so we have to compensate for that.
|
| - time_t local_delta = before - ::mktime(::gmtime(&before)); // NOLINT
|
| - time_t t = ::mktime(&tm) + local_delta;
|
| -
|
| - EXPECT_TRUE(before <= t && t <= after);
|
| - EXPECT_TRUE(0 <= microseconds && microseconds < 1000000);
|
| -}
|
| -
|
| TEST(TimeTest, TestTimeDiff64) {
|
| int64_t ts_diff = 100;
|
| int64_t ts_earlier = rtc::Time64();
|
|
|