From a1facdcf0f1a28d92c8b9fe01125202f28044432 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Thu, 5 Apr 2012 16:59:01 +0000 Subject: [PATCH] Re-enabled video sync tests (new attempt). BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/478001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1992 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/standard/video_sync_test.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/voice_engine/main/test/auto_test/standard/video_sync_test.cc b/src/voice_engine/main/test/auto_test/standard/video_sync_test.cc index 8dca4c5505..7340f7b75d 100644 --- a/src/voice_engine/main/test/auto_test/standard/video_sync_test.cc +++ b/src/voice_engine/main/test/auto_test/standard/video_sync_test.cc @@ -20,7 +20,7 @@ const int kMinimumReasonableDelayEstimateMs = 45; #endif // !MAC_IPHONE -class DISABLED_VideoSyncTest : public AfterStreamingFixture { +class VideoSyncTest : public AfterStreamingFixture { protected: // This test will verify that delay estimates converge (e.g. the standard // deviation for the last five seconds' estimates is less than 20) without @@ -67,30 +67,30 @@ class DISABLED_VideoSyncTest : public AfterStreamingFixture { } }; -TEST_F(DISABLED_VideoSyncTest, CanGetPlayoutTimestampWhilePlayingWithoutSettingItFirst) { +TEST_F(VideoSyncTest, CanGetPlayoutTimestampWhilePlayingWithoutSettingItFirst) { unsigned int ignored; EXPECT_EQ(0, voe_vsync_->GetPlayoutTimestamp(channel_, ignored)); } -TEST_F(DISABLED_VideoSyncTest, CannotSetInitTimestampWhilePlaying) { +TEST_F(VideoSyncTest, CannotSetInitTimestampWhilePlaying) { EXPECT_EQ(-1, voe_vsync_->SetInitTimestamp(channel_, 12345)); } -TEST_F(DISABLED_VideoSyncTest, CannotSetInitSequenceNumberWhilePlaying) { +TEST_F(VideoSyncTest, CannotSetInitSequenceNumberWhilePlaying) { EXPECT_EQ(-1, voe_vsync_->SetInitSequenceNumber(channel_, 123)); } -TEST_F(DISABLED_VideoSyncTest, CanSetInitTimestampWhileStopped) { +TEST_F(VideoSyncTest, CanSetInitTimestampWhileStopped) { EXPECT_EQ(0, voe_base_->StopSend(channel_)); EXPECT_EQ(0, voe_vsync_->SetInitTimestamp(channel_, 12345)); } -TEST_F(DISABLED_VideoSyncTest, CanSetInitSequenceNumberWhileStopped) { +TEST_F(VideoSyncTest, CanSetInitSequenceNumberWhileStopped) { EXPECT_EQ(0, voe_base_->StopSend(channel_)); EXPECT_EQ(0, voe_vsync_->SetInitSequenceNumber(channel_, 123)); } -TEST_F(DISABLED_VideoSyncTest, DelayEstimatesStabilizeDuring15sAndAreNotTooLow) { +TEST_F(VideoSyncTest, DelayEstimatesStabilizeDuring15sAndAreNotTooLow) { EXPECT_EQ(0, voe_base_->StopSend(channel_)); EXPECT_EQ(0, voe_vsync_->SetInitTimestamp(channel_, 12345)); EXPECT_EQ(0, voe_vsync_->SetInitSequenceNumber(channel_, 123)); @@ -99,7 +99,7 @@ TEST_F(DISABLED_VideoSyncTest, DelayEstimatesStabilizeDuring15sAndAreNotTooLow) CheckEstimatesConvergeReasonablyWell(kMinimumReasonableDelayEstimateMs); } -TEST_F(DISABLED_VideoSyncTest, DelayEstimatesStabilizeAfterNetEqMinDelayChanges45s) { +TEST_F(VideoSyncTest, DelayEstimatesStabilizeAfterNetEqMinDelayChanges45s) { EXPECT_EQ(0, voe_base_->StopSend(channel_)); EXPECT_EQ(0, voe_vsync_->SetInitTimestamp(channel_, 12345)); EXPECT_EQ(0, voe_vsync_->SetInitSequenceNumber(channel_, 123)); @@ -113,7 +113,7 @@ TEST_F(DISABLED_VideoSyncTest, DelayEstimatesStabilizeAfterNetEqMinDelayChanges4 } #if !defined(WEBRTC_ANDROID) -TEST_F(DISABLED_VideoSyncTest, CanGetPlayoutBufferSize) { +TEST_F(VideoSyncTest, CanGetPlayoutBufferSize) { int ignored; EXPECT_EQ(0, voe_vsync_->GetPlayoutBufferSize(ignored)); }