Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome. http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457 > Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base. > > BUG=N/A > R=andrew@webrtc.org, wu@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/12199004 TBR=henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/14479004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -1,146 +0,0 @@
|
||||
/*
|
||||
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/base/common.h"
|
||||
#include "webrtc/base/gunit.h"
|
||||
#include "webrtc/base/thread.h"
|
||||
#include "webrtc/base/timeutils.h"
|
||||
|
||||
namespace rtc {
|
||||
|
||||
TEST(TimeTest, TimeInMs) {
|
||||
uint32 ts_earlier = Time();
|
||||
Thread::SleepMs(100);
|
||||
uint32 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);
|
||||
|
||||
// We can't depend on ts_later and ts_earlier to be exactly 500 apart
|
||||
// since time elapses between the calls to Time() and TimeAfter(500)
|
||||
EXPECT_LE(500, TimeDiff(ts_later, ts_earlier));
|
||||
EXPECT_GE(-500, TimeDiff(ts_earlier, ts_later));
|
||||
|
||||
// Time has elapsed since ts_earlier
|
||||
EXPECT_GE(TimeSince(ts_earlier), 0);
|
||||
|
||||
// ts_earlier is earlier than now, so TimeUntil ts_earlier is -ve
|
||||
EXPECT_LE(TimeUntil(ts_earlier), 0);
|
||||
|
||||
// ts_later likely hasn't happened yet, so TimeSince could be -ve
|
||||
// but within 500
|
||||
EXPECT_GE(TimeSince(ts_later), -500);
|
||||
|
||||
// TimeUntil ts_later is at most 500
|
||||
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;
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
} // namespace rtc
|
||||
Reference in New Issue
Block a user