Chromium Code Reviews| Index: webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
| diff --git a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
| index 345a962223ebdc4a670ca6f0c88b076d9bd2375b..c030df8c1fef6eab1e9fb32c451b0e55ac5488e5 100644 |
| --- a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
| +++ b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
| @@ -15,6 +15,7 @@ |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "webrtc/base/random.h" |
| #include "webrtc/base/timeutils.h" |
| +#include "webrtc/system_wrappers/include/logging.h" |
| #include "webrtc/system_wrappers/include/sleep.h" |
| namespace webrtc { |
| @@ -25,12 +26,11 @@ namespace webrtc { |
| // --gtest_also_run_disabled_tests --gtest_filter=ScreenDrawerTest.*. |
| TEST(ScreenDrawerTest, DISABLED_DrawRectangles) { |
| std::unique_ptr<ScreenDrawer> drawer = ScreenDrawer::Create(); |
| - if (!drawer) { |
| - // No ScreenDrawer implementation for current platform. |
| + if (!drawer || drawer->DrawableRegion().is_empty()) { |
| + LOG(LS_WARNING) << "No ScreenDrawer implementation for current platform."; |
|
Jamie
2016/08/31 17:39:39
Use different logs for the two failure cases; Draw
Hzj_jie
2016/08/31 21:22:40
Done.
|
| return; |
| } |
| - drawer->Clear(); |
| DesktopRect rect = drawer->DrawableRegion(); |
| Random random(rtc::TimeMicros()); |
| for (int i = 0; i < 100; i++) { |
| @@ -40,16 +40,15 @@ TEST(ScreenDrawerTest, DISABLED_DrawRectangles) { |
| drawer->DrawRectangle( |
| DesktopRect::MakeLTRB(left, top, random.Rand(left + 1, rect.right()), |
| random.Rand(top + 1, rect.bottom())), |
| - random.Rand<uint32_t>()); |
| + Color(random.Rand<uint8_t>(), random.Rand<uint8_t>(), |
| + random.Rand<uint8_t>(), random.Rand<uint8_t>())); |
| if (i == 50) { |
| SleepMs(10000); |
| - drawer->Clear(); |
| } |
| } |
| SleepMs(10000); |
| - drawer->Clear(); |
| } |
| } // namespace webrtc |