Improve VideoCaptureImpl unittest.

content/renderer/media/video_capture_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "content/child/child_process.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "media/base/bind_to_current_loop.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
@@ skipping 12 matching lines @@
 
  protected:
   virtual ~MockVideoCaptureMessageFilter() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoCaptureMessageFilter);
 };
 
 class VideoCaptureImplTest : public ::testing::Test {
  public:
   class MockVideoCaptureImpl : public VideoCaptureImpl {

[mcasas, 2015/08/25 00:14:58]

This is odd: A test class that Mocks the object to test? :)

VideoCaptureImpl is basically a billboard routing messages
between an impl of VideoCaptureMessageFilter::Delegate
and controlled from VideoCaptureImplManager via a few
methods StartCapture() etc. All that maintaining a |state_|.

I think this whole test should be refactored into setting
expectations on mocked functions, i.e. create a series of
MOCK_METHODX()s to be acting as a 
VideoCaptureStateUpdateCB, VideoCaptureDeliverFrameCB,
etc, plug them in via StartCapture() and company, then 
per test, set EXPECT()s and ping the class by exercising
the various IPC messages, possibly observing |state_|
changes. WDYT?

[msu.koo, 2015/08/25 00:45:23]

Thank you for your comments. I agree with your opinion,
and I think it's better to address your comments as different patch-set because
this patch-set was intended to test "bufferAdded, and bufferAddedAfterStop"

    public:
     MockVideoCaptureImpl(const media::VideoCaptureSessionId id,
                          VideoCaptureMessageFilter* filter)
-        : VideoCaptureImpl(id, filter) {
+        : VideoCaptureImpl(id, filter), buffer_received_(0) {
     }
     ~MockVideoCaptureImpl() override {}
 
     // Override Send() to mimic device to send events.
     void Send(IPC::Message* message) override {
       CHECK(message);
 
       // In this method, messages are sent to the according handlers as if
       // we are the device.
       bool handled = true;
@@ skipping 22 matching lines @@
 
     void DevicePauseCapture(int device_id) {}
 
     void DeviceStopCapture(int device_id) {
       OnStateChanged(VIDEO_CAPTURE_STATE_STOPPED);
     }
 
     void DeviceReceiveEmptyBuffer(int device_id,
                                   int buffer_id,
                                   uint32 sync_point,
-                                  double consumer_resource_utilization) {}
+                                  double consumer_resource_utilization) {
+      buffer_received_++;
+    }
 
     void DeviceGetSupportedFormats(int device_id,
                                    media::VideoCaptureSessionId session_id) {
       // When the mock message filter receives a request for the device
       // supported formats, replies immediately with an empty format list.
       OnDeviceSupportedFormatsEnumerated(
           media::VideoCaptureFormats());
     }
 
     void DeviceGetFormatsInUse(int device_id,
                                media::VideoCaptureSessionId session_id) {
       OnDeviceFormatsInUseReceived(media::VideoCaptureFormats());
     }
 
     void ReceiveStateChangeMessage(VideoCaptureState state) {
       OnStateChanged(state);
     }
 
     const media::VideoCaptureParams& capture_params() const {
       return capture_params_;
     }
 
    private:
     media::VideoCaptureParams capture_params_;
+
+   public:
+    int buffer_received_;

[ajose, 2015/08/24 17:46:31]

s/buffer_received/buffers_received/ ? 
Also consider making this private and adding a getter.

[msu.koo, 2015/08/25 00:45:23]

Done.

   };
 
   VideoCaptureImplTest() {
     params_small_.requested_format = media::VideoCaptureFormat(
         gfx::Size(176, 144), 30, media::VIDEO_CAPTURE_PIXEL_FORMAT_I420);
 
     params_large_.requested_format = media::VideoCaptureFormat(
         gfx::Size(320, 240), 30, media::VIDEO_CAPTURE_PIXEL_FORMAT_I420);
 
     child_process_.reset(new ChildProcess());
@@ skipping 27 matching lines @@
   void StartCapture(int client_id,
                     const media::VideoCaptureParams& params) {
     video_capture_impl_->StartCapture(
         client_id, params,
         base::Bind(&VideoCaptureImplTest::OnStateUpdate,
                    base::Unretained(this)),
         base::Bind(&VideoCaptureImplTest::OnFrameReady,
                    base::Unretained(this)));
   }
 
+  void NewBuffer(int buffer_id, const base::SharedMemory& shm) {
+    video_capture_impl_->OnBufferCreated(
+        base::SharedMemory::DuplicateHandle(shm.handle()),
+        shm.mapped_size(), buffer_id);
+  }
+
+  void BufferReceived(int buffer_id, const gfx::Size& size) {
+    base::DictionaryValue metadata;
+    gpu::MailboxHolder mailbox;
+    video_capture_impl_->OnBufferReceived(
+        buffer_id, base::TimeTicks::Now(), base::DictionaryValue(),
+        media::PIXEL_FORMAT_I420, media::VideoFrame::STORAGE_SHMEM, size,
+        gfx::Rect(size.width(), size.height()), mailbox);
+  }
+
+  void BufferDestroyed(int buffer_id) {
+    video_capture_impl_->OnBufferDestroyed(buffer_id);
+  }
+
   void StopCapture(int client_id) {
     video_capture_impl_->StopCapture(client_id);
   }
 
   void DeInit() {
     video_capture_impl_->DeInit();
   }
 
   void GetDeviceSupportedFormats() {
     const base::Callback<void(const media::VideoCaptureFormats&)>
@@ skipping 109 matching lines @@
   StartCapture(0, params_small_);
   StartCapture(1, params_large_);
   StopCapture(0);
   StopCapture(1);
   DeInit();
   DCHECK(video_capture_impl_->capture_params().requested_format
             .frame_size ==
          params_small_.requested_format.frame_size);
 }
 
+TEST_F(VideoCaptureImplTest, BufferReceived) {
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED)).Times(1);
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED)).Times(1);
+  EXPECT_CALL(*this, OnFrameReady(_, _));
+
+  // Create a fake shared memory for buffer.
+  base::SharedMemory shm;
+  size_t i420_frame_size = media::VideoFrame::AllocationSize(
+      media::PIXEL_FORMAT_I420, params_large_.requested_format.frame_size);
+  ASSERT_TRUE(shm.CreateAndMapAnonymous(i420_frame_size));
+
+  Init();
+  StartCapture(0, params_large_);
+  NewBuffer(0, shm);
+  BufferReceived(0, params_large_.requested_format.frame_size);
+  StopCapture(0);
+  BufferDestroyed(0);
+  DeInit();
+}

[ajose, 2015/08/24 17:46:31]

EXPECT_EQ(this->video_capture_impl_->buffer_received_, 1); ?

[msu.koo, 2015/08/25 00:45:23]

I think this line is not required on this unittest because
buffer-received will be handled outside of VideoCaptureImpl except the case when
the capturing is stopped(This case is tested in "BufferReceivedAfterStop".)

+
+TEST_F(VideoCaptureImplTest, BufferReceivedAfterStop) {
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED)).Times(1);
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED)).Times(1);
+  EXPECT_CALL(*this, OnFrameReady(_, _)).Times(0);
+
+  // Create a fake shared memory for buffer.
+  base::SharedMemory shm;
+  size_t i420_frame_size = media::VideoFrame::AllocationSize(
+      media::PIXEL_FORMAT_I420, params_large_.requested_format.frame_size);
+  ASSERT_TRUE(shm.CreateAndMapAnonymous(i420_frame_size));
+
+  Init();
+  StartCapture(0, params_large_);
+  NewBuffer(0, shm);
+  StopCapture(0);
+  BufferReceived(0, params_large_.requested_format.frame_size);
+  BufferDestroyed(0);
+  DeInit();
+
+  EXPECT_EQ(this->video_capture_impl_->buffer_received_, 1);
+}
+
 TEST_F(VideoCaptureImplTest, EndedBeforeStop) {
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED));
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED));
 
    Init();
    StartCapture(0, params_small_);
 
    // Receive state change message from browser.
    video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ENDED);
 
    StopCapture(0);
    DeInit();
 }
 
 TEST_F(VideoCaptureImplTest, ErrorBeforeStop) {
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED));
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_ERROR));
 
    Init();
    StartCapture(0, params_small_);
 
    // Receive state change message from browser.
    video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ERROR);
 
    StopCapture(0);
    DeInit();
 }
 
 }  // namespace content