diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc index 0d46e2b641..5bbec3362c 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc @@ -80,7 +80,7 @@ std::vector FakeVideoSendStream::GetVideoStreams() { return video_streams_; } -bool FakeVideoSendStream::IsSending() { +bool FakeVideoSendStream::IsSending() const { return sending_; } @@ -117,6 +117,10 @@ webrtc::VideoReceiveStream::Config FakeVideoReceiveStream::GetConfig() { return config_; } +bool FakeVideoReceiveStream::IsReceiving() const { + return receiving_; +} + webrtc::VideoReceiveStream::Stats FakeVideoReceiveStream::GetStats() const { return webrtc::VideoReceiveStream::Stats(); } @@ -124,9 +128,11 @@ webrtc::VideoReceiveStream::Stats FakeVideoReceiveStream::GetStats() const { void FakeVideoReceiveStream::Start() { receiving_ = true; } + void FakeVideoReceiveStream::Stop() { receiving_ = false; } + void FakeVideoReceiveStream::GetCurrentReceiveCodec(webrtc::VideoCodec* codec) { } @@ -1373,9 +1379,8 @@ TEST_F(WebRtcVideoChannel2Test, SendStreamNotSendingByDefault) { EXPECT_FALSE(AddSendStream()->IsSending()); } -TEST_F(WebRtcVideoChannel2Test, DISABLED_ReceiveStreamReceivingByDefault) { - // Is this test correct though? Auto-receive? Enable receive on first packet? - FAIL() << "Not implemented."; // TODO(pbos): Implement. +TEST_F(WebRtcVideoChannel2Test, ReceiveStreamReceivingByDefault) { + EXPECT_TRUE(AddRecvStream()->IsReceiving()); } TEST_F(WebRtcVideoChannel2Test, SetSend) { diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.h b/talk/media/webrtc/webrtcvideoengine2_unittest.h index 367116731f..b5baa341d9 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.h +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.h @@ -43,7 +43,7 @@ class FakeVideoSendStream : public webrtc::VideoSendStream { webrtc::VideoSendStream::Config GetConfig(); std::vector GetVideoStreams(); - bool IsSending(); + bool IsSending() const; private: virtual webrtc::VideoSendStream::Stats GetStats() const OVERRIDE; @@ -69,6 +69,8 @@ class FakeVideoReceiveStream : public webrtc::VideoReceiveStream { webrtc::VideoReceiveStream::Config GetConfig(); + bool IsReceiving() const; + private: virtual webrtc::VideoReceiveStream::Stats GetStats() const OVERRIDE;