Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(917)

Side by Side Diff: webrtc/modules/desktop_capture/screen_capturer_integration_test.cc

Issue 2513213002: Enable ScreenCapturerIntegrationTests (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 EXPECT_CALL(callback_, 251 EXPECT_CALL(callback_,
252 OnCaptureResultPtr(DesktopCapturer::Result::SUCCESS, _)) 252 OnCaptureResultPtr(DesktopCapturer::Result::SUCCESS, _))
253 .WillOnce(SaveUniquePtrArg(&frame)); 253 .WillOnce(SaveUniquePtrArg(&frame));
254 capturer->CaptureFrame(); 254 capturer->CaptureFrame();
255 EXPECT_TRUE(frame); 255 EXPECT_TRUE(frame);
256 return frame; 256 return frame;
257 } 257 }
258 }; 258 };
259 259
260 // Disabled because it's flaky. 260 // Disabled because it's flaky.
261 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 261 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
kjellander_webrtc 2016/11/21 06:49:10 Please also clean up the comments about disabling
262 TEST_F(ScreenCapturerIntegrationTest, DISABLED_CaptureUpdatedRegion) { 262 TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegion) {
263 TestCaptureUpdatedRegion(); 263 TestCaptureUpdatedRegion();
264 } 264 }
265 265
266 // Disabled because it's flaky. 266 // Disabled because it's flaky.
267 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 267 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
268 TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoCapturers) { 268 TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) {
269 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); 269 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_);
270 SetUp(); 270 SetUp();
271 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); 271 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
272 } 272 }
273 273
274 #if defined(WEBRTC_WIN) 274 #if defined(WEBRTC_WIN)
275 275
276 // Disabled because it's flaky. 276 // Disabled because it's flaky.
277 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 277 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
278 TEST_F(ScreenCapturerIntegrationTest, 278 TEST_F(ScreenCapturerIntegrationTest,
279 DISABLED_CaptureUpdatedRegionWithDirectxCapturer) { 279 CaptureUpdatedRegionWithDirectxCapturer) {
280 if (!CreateDirectxCapturer()) { 280 if (!CreateDirectxCapturer()) {
281 return; 281 return;
282 } 282 }
283 283
284 TestCaptureUpdatedRegion(); 284 TestCaptureUpdatedRegion();
285 } 285 }
286 286
287 // Disabled because it's flaky. 287 // Disabled because it's flaky.
288 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 288 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
289 TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoDirectxCapturers) { 289 TEST_F(ScreenCapturerIntegrationTest, TwoDirectxCapturers) {
290 if (!CreateDirectxCapturer()) { 290 if (!CreateDirectxCapturer()) {
291 return; 291 return;
292 } 292 }
293 293
294 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); 294 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_);
295 RTC_CHECK(CreateDirectxCapturer()); 295 RTC_CHECK(CreateDirectxCapturer());
296 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); 296 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
297 } 297 }
298 298
299 // Disabled because it's flaky. 299 // Disabled because it's flaky.
300 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 300 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
301 TEST_F(ScreenCapturerIntegrationTest, 301 TEST_F(ScreenCapturerIntegrationTest,
302 DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) { 302 CaptureUpdatedRegionWithMagnifierCapturer) {
303 CreateMagnifierCapturer(); 303 CreateMagnifierCapturer();
304 TestCaptureUpdatedRegion(); 304 TestCaptureUpdatedRegion();
305 } 305 }
306 306
307 // Disabled because it's flaky. 307 // Disabled because it's flaky.
308 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 308 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
309 TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoMagnifierCapturers) { 309 TEST_F(ScreenCapturerIntegrationTest, TwoMagnifierCapturers) {
310 CreateMagnifierCapturer(); 310 CreateMagnifierCapturer();
311 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); 311 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_);
312 CreateMagnifierCapturer(); 312 CreateMagnifierCapturer();
313 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); 313 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
314 } 314 }
315 315
316 // Disabled because it's flaky. 316 // Disabled because it's flaky.
317 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 317 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666
318 TEST_F(ScreenCapturerIntegrationTest, 318 TEST_F(ScreenCapturerIntegrationTest,
319 DISABLED_MaybeCaptureUpdatedRegionWithDirectxCapturer) { 319 MaybeCaptureUpdatedRegionWithDirectxCapturer) {
320 // Even DirectX capturer is not supported in current system, we should be able 320 // Even DirectX capturer is not supported in current system, we should be able
321 // to select a usable capturer. 321 // to select a usable capturer.
322 MaybeCreateDirectxCapturer(); 322 MaybeCreateDirectxCapturer();
323 TestCaptureUpdatedRegion(); 323 TestCaptureUpdatedRegion();
324 } 324 }
325 325
326 #endif // defined(WEBRTC_WIN) 326 #endif // defined(WEBRTC_WIN)
327 327
328 } // namespace webrtc 328 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698