commit 85f42949d66a86b382ef9ba9ec0fe496890bde08
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 22 09:14:58 2014 +0000
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 22 09:14:58 2014 +0000
tree 6eeb1f866d101f86769ec9d6908ffe70be68b9d0
parent b0c8228755e6d86a77f3a74999216b31feb44a6b

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

talk/media/webrtc/webrtcvideoengine2_unittest.cc

diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
index 0d46e2b..5bbec33 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -80,7 +80,7 @@
   return video_streams_;
 }
 
-bool FakeVideoSendStream::IsSending() {
+bool FakeVideoSendStream::IsSending() const {
   return sending_;
 }
 
@@ -117,6 +117,10 @@
   return config_;
 }
 
+bool FakeVideoReceiveStream::IsReceiving() const {
+  return receiving_;
+}
+
 webrtc::VideoReceiveStream::Stats FakeVideoReceiveStream::GetStats() const {
   return webrtc::VideoReceiveStream::Stats();
 }
@@ -124,9 +128,11 @@
 void FakeVideoReceiveStream::Start() {
   receiving_ = true;
 }
+
 void FakeVideoReceiveStream::Stop() {
   receiving_ = false;
 }
+
 void FakeVideoReceiveStream::GetCurrentReceiveCodec(webrtc::VideoCodec* codec) {
 }
 
@@ -1373,9 +1379,8 @@
   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) {

talk/media/webrtc/webrtcvideoengine2_unittest.h

diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.h b/talk/media/webrtc/webrtcvideoengine2_unittest.h
index 3671167..b5baa34 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.h
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.h
@@ -43,7 +43,7 @@
   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 @@
 
   webrtc::VideoReceiveStream::Config GetConfig();
 
+  bool IsReceiving() const;
+
  private:
   virtual webrtc::VideoReceiveStream::Stats GetStats() const OVERRIDE;