Deflaky ScreenCapturerTest

webrtc/modules/desktop_capture/screen_capturer_unittest.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 33 matching lines @@
 
 namespace {
 
 ACTION_P(SaveUniquePtrArg, dest) {
   *dest = std::move(*arg1);
 }
 
 // Returns true if color in |rect| of |frame| is |color|.
 bool ArePixelsColoredBy(const DesktopFrame& frame,
                         DesktopRect rect,
-                        RgbaColor color) {
-  // updated_region() should cover the painted area.
-  DesktopRegion updated_region(frame.updated_region());
-  updated_region.IntersectWith(rect);
-  if (!updated_region.Equals(DesktopRegion(rect))) {
-    return false;
+                        RgbaColor color,
+                        bool may_partially_draw) {
+  if (!may_partially_draw) {
+    // updated_region() should cover the painted area.
+    DesktopRegion updated_region(frame.updated_region());
+    updated_region.IntersectWith(rect);
+    if (!updated_region.Equals(DesktopRegion(rect))) {
+      return false;
+    }
   }
 
   // Color in the |rect| should be |color|.
   uint8_t* row = frame.GetFrameDataAtPos(rect.top_left());
   for (int i = 0; i < rect.height(); i++) {
     uint8_t* column = row;
     for (int j = 0; j < rect.width(); j++) {
       if (color != RgbaColor(column)) {
         return false;
       }
@@ skipping 30 matching lines @@
         drawer->DrawableRegion().height() < kTestArea) {
       LOG(LS_WARNING) << "ScreenDrawer::DrawableRegion() is too small for the "
                          "CaptureUpdatedRegion tests.";
       return;
     }
 
     for (ScreenCapturer* capturer : capturers) {
       capturer->Start(&callback_);
     }
 
-    // Draw a set of |kRectSize| by |kRectSize| rectangles at (|i|, |i|). One of
-    // (controlled by |c|) its primary colors is |i|, and the other two are
-    // 0xff. So we won't draw a white rectangle.
+    // Draw a set of |kRectSize| by |kRectSize| rectangles at (|i|, |i|), or
+    // |i| by |i| rectangles at (|kRectSize|, |kRectSize|). One of (controlled
+    // by |c|) its primary colors is |i|, and the other two are 0x7f. So we
+    // won't draw a black or white rectangle.
     for (int c = 0; c < 3; c++) {
+      // A fixed size rectangle.
       for (int i = 0; i < kTestArea - kRectSize; i += 16) {
         DesktopRect rect = DesktopRect::MakeXYWH(i, i, kRectSize, kRectSize);
         rect.Translate(drawer->DrawableRegion().top_left());
         RgbaColor color((c == 0 ? (i & 0xff) : 0x7f),
                         (c == 1 ? (i & 0xff) : 0x7f),
                         (c == 2 ? (i & 0xff) : 0x7f));
-        drawer->Clear();
-        drawer->DrawRectangle(rect, color);
+        TestCaptureOneFrame(capturers, drawer.get(), rect, color);
+      }
+
+      // A variable-size rectangle.
+      for (int i = 0; i < kTestArea - kRectSize; i += 16) {
+        DesktopRect rect = DesktopRect::MakeXYWH(kRectSize, kRectSize, i, i);
+        rect.Translate(drawer->DrawableRegion().top_left());
+        RgbaColor color((c == 0 ? (i & 0xff) : 0x7f),
+                        (c == 1 ? (i & 0xff) : 0x7f),
+                        (c == 2 ? (i & 0xff) : 0x7f));
         TestCaptureOneFrame(capturers, drawer.get(), rect, color);
       }
     }
   }
 
   void TestCaptureUpdatedRegion() {
     TestCaptureUpdatedRegion({capturer_.get()});
   }
 
 #if defined(WEBRTC_WIN)
@@ skipping 27 matching lines @@
 
  private:
   // Repeats capturing the frame by using |capturers| one-by-one for 600 times,
   // typically 30 seconds, until they succeeded captured a |color| rectangle at
   // |rect|. This function uses |drawer|->WaitForPendingDraws() between two
   // attempts to wait for the screen to update.
   void TestCaptureOneFrame(std::vector<ScreenCapturer*> capturers,
                            ScreenDrawer* drawer,
                            DesktopRect rect,
                            RgbaColor color) {
+    const int wait_capture_round = 600;
+    drawer->Clear();
     size_t succeeded_capturers = 0;
-    const int wait_capture_round = 600;
     for (int i = 0; i < wait_capture_round; i++) {
+      drawer->DrawRectangle(rect, color);
       drawer->WaitForPendingDraws();
       for (size_t j = 0; j < capturers.size(); j++) {
         if (capturers[j] == nullptr) {
           // ScreenCapturer should return an empty updated_region() if no
           // update detected. So we won't test it again if it has captured
           // the rectangle we drew.
           continue;
         }
         std::unique_ptr<DesktopFrame> frame = CaptureFrame(capturers[j]);
         if (!frame) {
           // CaptureFrame() has triggered an assertion failure already, we
           // only need to return here.
           return;
         }
 
-        if (ArePixelsColoredBy(*frame, rect, color)) {
+        if (ArePixelsColoredBy(
+            *frame, rect, color, drawer->MayDrawIncompleteShapes())) {
           capturers[j] = nullptr;
           succeeded_capturers++;
         }
       }
 
       if (succeeded_capturers == capturers.size()) {
         break;
       }
     }
 
@@ skipping 74 matching lines @@
   EXPECT_FALSE(frame->updated_region().is_empty());
   DesktopRegion::Iterator it(frame->updated_region());
   ASSERT_TRUE(!it.IsAtEnd());
   EXPECT_TRUE(it.rect().equals(DesktopRect::MakeSize(frame->size())));
   it.Advance();
   EXPECT_TRUE(it.IsAtEnd());
 }
 
 // Disabled due to being flaky due to the fact that it uses rendering / UI, see
 // webrtc/6366.
-TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegion) {
+TEST_F(ScreenCapturerTest, CaptureUpdatedRegion) {
   TestCaptureUpdatedRegion();
 }
 
 // Disabled due to being flaky due to the fact that it uses rendering / UI, see
 // webrtc/6366.
-TEST_F(ScreenCapturerTest, DISABLED_TwoCapturers) {
+TEST_F(ScreenCapturerTest, TwoCapturers) {
   std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
   SetUp();
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
 #if defined(WEBRTC_WIN)
 
 TEST_F(ScreenCapturerTest, UseSharedBuffers) {
   std::unique_ptr<DesktopFrame> frame;
   EXPECT_CALL(callback_,
@@ skipping 52 matching lines @@
   capturer_->SetSharedMemoryFactory(
       std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory()));
   capturer_->Capture(DesktopRegion());
   ASSERT_TRUE(frame);
   ASSERT_TRUE(frame->shared_memory());
   EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId);
 }
 
 // Disabled due to being flaky due to the fact that it uses rendering / UI, see
 // webrtc/6366.
-TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegionWithDirectxCapturer) {
+TEST_F(ScreenCapturerTest, CaptureUpdatedRegionWithDirectxCapturer) {
   if (!CreateDirectxCapturer()) {
     return;
   }
 
   TestCaptureUpdatedRegion();
 }
 
 // Disabled due to being flaky due to the fact that it uses rendering / UI, see
 // webrtc/6366.
-TEST_F(ScreenCapturerTest, DISABLED_TwoDirectxCapturers) {
+TEST_F(ScreenCapturerTest, TwoDirectxCapturers) {
   if (!CreateDirectxCapturer()) {
     return;
   }
 
   std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
   RTC_CHECK(CreateDirectxCapturer());
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
 // Disabled due to being flaky due to the fact that it uses rendering / UI, see
 // webrtc/6366.
-TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) {
+TEST_F(ScreenCapturerTest, CaptureUpdatedRegionWithMagnifierCapturer) {
   CreateMagnifierCapturer();
   TestCaptureUpdatedRegion();
 }
 
 // Disabled due to being flaky due to the fact that it uses rendering / UI, see
 // webrtc/6366.
-TEST_F(ScreenCapturerTest, DISABLED_TwoMagnifierCapturers) {
+TEST_F(ScreenCapturerTest, TwoMagnifierCapturers) {
   CreateMagnifierCapturer();
   std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
   CreateMagnifierCapturer();
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
 // Disabled due to being flaky due to the fact that it uses rendering / UI, see
 // webrtc/6366.
 TEST_F(ScreenCapturerTest,
        DISABLED_MaybeCaptureUpdatedRegionWithDirectxCapturer) {
   // Even DirectX capturer is not supported in current system, we should be able
   // to select a usable capturer.
   MaybeCreateDirectxCapturer();
   TestCaptureUpdatedRegion();
 }
 
 #endif  // defined(WEBRTC_WIN)
 
 }  // namespace webrtc