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

Unified Diff: webrtc/p2p/base/port_unittest.cc

Issue 1793553002: Using 64-bit timestamp in webrtc/p2p (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « webrtc/p2p/base/port.cc ('k') | webrtc/p2p/base/relayport.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/port_unittest.cc
diff --git a/webrtc/p2p/base/port_unittest.cc b/webrtc/p2p/base/port_unittest.cc
index 4caa326a857b7abe80002b81fb1be00581ed383a..74285fa7e6a20cdb6a102e38764144923f132d71 100644
--- a/webrtc/p2p/base/port_unittest.cc
+++ b/webrtc/p2p/base/port_unittest.cc
@@ -266,7 +266,7 @@ class TestChannel : public sigslot::has_slots<> {
void Ping() {
Ping(0);
}
- void Ping(uint32_t now) { conn_->Ping(now); }
+ void Ping(int64_t now) { conn_->Ping(now); }
void Stop() {
if (conn_) {
conn_->Destroy();
@@ -1261,9 +1261,9 @@ TEST_F(PortTest, TestConnectionDead) {
ASSERT_EQ_WAIT(1, ch2.complete_count(), kTimeout);
// Test case that the connection has never received anything.
- uint32_t before_created = rtc::Time();
+ int64_t before_created = rtc::Time64();
ch1.CreateConnection(GetCandidate(port2));
- uint32_t after_created = rtc::Time();
+ int64_t after_created = rtc::Time64();
Connection* conn = ch1.conn();
ASSERT(conn != nullptr);
// It is not dead if it is after MIN_CONNECTION_LIFETIME but not pruned.
@@ -1284,9 +1284,9 @@ TEST_F(PortTest, TestConnectionDead) {
ch1.CreateConnection(GetCandidate(port2));
conn = ch1.conn();
ASSERT(conn != nullptr);
- uint32_t before_last_receiving = rtc::Time();
+ int64_t before_last_receiving = rtc::Time64();
conn->ReceivedPing();
- uint32_t after_last_receiving = rtc::Time();
+ int64_t after_last_receiving = rtc::Time64();
// The connection will be dead after DEAD_CONNECTION_RECEIVE_TIMEOUT
conn->UpdateState(
before_last_receiving + DEAD_CONNECTION_RECEIVE_TIMEOUT - 1);
@@ -2033,13 +2033,13 @@ TEST_F(PortTest, TestHandleStunBindingIndication) {
rtc::PacketTime());
ASSERT_TRUE_WAIT(lport->last_stun_msg() != NULL, 1000);
EXPECT_EQ(STUN_BINDING_RESPONSE, lport->last_stun_msg()->type());
- uint32_t last_ping_received1 = lconn->last_ping_received();
+ int64_t last_ping_received1 = lconn->last_ping_received();
// Adding a delay of 100ms.
rtc::Thread::Current()->ProcessMessages(100);
// Pinging lconn using stun indication message.
lconn->OnReadPacket(buf->Data(), buf->Length(), rtc::PacketTime());
- uint32_t last_ping_received2 = lconn->last_ping_received();
+ int64_t last_ping_received2 = lconn->last_ping_received();
EXPECT_GT(last_ping_received2, last_ping_received1);
}
@@ -2313,7 +2313,7 @@ TEST_F(PortTest, TestWritableState) {
for (uint32_t i = 1; i <= CONNECTION_WRITE_CONNECT_FAILURES; ++i) {
ch1.Ping(i);
}
- uint32_t unreliable_timeout_delay = CONNECTION_WRITE_CONNECT_TIMEOUT + 500u;
+ int unreliable_timeout_delay = CONNECTION_WRITE_CONNECT_TIMEOUT + 500;
ch1.conn()->UpdateState(unreliable_timeout_delay);
EXPECT_EQ(Connection::STATE_WRITE_UNRELIABLE, ch1.conn()->write_state());
« no previous file with comments | « webrtc/p2p/base/port.cc ('k') | webrtc/p2p/base/relayport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698