Enable ReceiveStreamReceivingByDefault test.

BUG=1788
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20019004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6754 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-07-22 09:14:58 +00:00
parent b0c8228755
commit 85f42949d6
2 changed files with 12 additions and 5 deletions

View File

@ -80,7 +80,7 @@ std::vector<webrtc::VideoStream> 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) {

View File

@ -43,7 +43,7 @@ class FakeVideoSendStream : public webrtc::VideoSendStream {
webrtc::VideoSendStream::Config GetConfig();
std::vector<webrtc::VideoStream> 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;