From 51faeed6be520f4ef5f1c32a5cc6e04280722cdd Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Thu, 22 Dec 2011 12:35:23 +0000 Subject: [PATCH] Fixed REMB unit test on Windows. TBR=pwestin Review URL: http://webrtc-codereview.appspot.com/330022 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1289 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/vie_remb_unittest.cc | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/video_engine/vie_remb_unittest.cc b/src/video_engine/vie_remb_unittest.cc index 25ea5a0923..afbdb0b0e8 100644 --- a/src/video_engine/vie_remb_unittest.cc +++ b/src/video_engine/vie_remb_unittest.cc @@ -13,6 +13,9 @@ #include #include +#if defined(_WIN32) +#include +#endif #include "modules/rtp_rtcp/interface/rtp_rtcp.h" #include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" @@ -31,6 +34,14 @@ class ViERembTest : public ::testing::Test { vie_remb_.reset(new VieRemb(1234)); } scoped_ptr vie_remb_; + + void TestSleep(unsigned int time_ms) { +#if defined(_WIN32) + ::Sleep(time_ms); +#else + usleep(time_ms * 1000); +#endif + } }; TEST_F(ViERembTest, OneModuleTestForSendingRemb) @@ -49,7 +60,7 @@ TEST_F(ViERembTest, OneModuleTestForSendingRemb) .WillRepeatedly(Return(ssrc[0])); // TODO(mflodman) Add fake clock and remove the lowered bitrate below. - usleep(1010000); + TestSleep(1010); EXPECT_CALL(rtp, SetREMBData(bitrate_estimate, 1, _)) .Times(1); vie_remb_->Process(); @@ -150,7 +161,7 @@ TEST_F(ViERembTest, NoRembForIncreasedBitrate) // Trigger a first call to have a running state. // TODO(mflodman) Add fake clock. - usleep(1010000); + TestSleep(1010); EXPECT_CALL(rtp_0, SetREMBData(bitrate_estimate[0] + bitrate_estimate[1], 2, _)) .Times(1); @@ -258,7 +269,7 @@ TEST_F(ViERembTest, NoOnReceivedBitrateChangedCall) vie_remb_->AddReceiveChannel(&rtp); // TODO(mflodman) Add fake clock. - usleep(1010000); + TestSleep(1010); // No bitrate estimate given, no callback expected. EXPECT_CALL(rtp, SetREMBData(_, _, _)) .Times(0);