third_party/WebKit/LayoutTests/media/video-controls-hidden-audio.html - Issue 2120783002: Convert video-controls* tests to testharness.js

Unified Diff: third_party/WebKit/LayoutTests/media/video-controls-hidden-audio.html

Issue 2120783002: Convert video-controls* tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/media/video-controls-focus-movement-on-hide-expected.txt ('k') | third_party/WebKit/LayoutTests/media/video-controls-hidden-audio-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/video-controls-hidden-audio.html

diff --git a/third_party/WebKit/LayoutTests/media/video-controls-hidden-audio.html b/third_party/WebKit/LayoutTests/media/video-controls-hidden-audio.html

index 1c621a08500f6f7d2f70a0631c3f2365874a5894..296918812aff8288cafa0945d2cbd99618dddcc9 100644

--- a/third_party/WebKit/LayoutTests/media/video-controls-hidden-audio.html

+++ b/third_party/WebKit/LayoutTests/media/video-controls-hidden-audio.html

@@ -1,46 +1,46 @@

+<!DOCTYPE html>

+<title>Test that hiding volume / mute button works as expected.</title>

+<script src="../resources/testharness.js"></script>

+<script src="../resources/testharnessreport.js"></script>

+<script src="media-controls.js"></script>

+<script src="media-file.js"></script>

-<p>Test that hiding volume / mute buttons works as expected.</p>

-<script src=media-file.js></script>

-<!-- TODO(foolip): Convert test to testharness.js. crbug.com/588956

- (Please avoid writing new tests using video-test.js) -->

-<script src=video-test.js></script>

-<script src=media-controls.js></script>

- video.src = findMediaFile("video", "content/test");

- run("video.load()");

- waitForEvent("canplaythrough", function () {

+async_test(function(t) {

+ var video = document.querySelector("video");

+ video.oncanplaythrough = t.step_func_done(function() {

// Enable hidden audio preferences to take effect.

- run("window.internals.setAllowHiddenVolumeControls(video, true)");

+ internals.setAllowHiddenVolumeControls(video, true);

// Request non-hidden audio controls.

- run("window.internals.settings.setPreferHiddenVolumeControls(false)");

- run("video.muted = false");

+ internals.settings.setPreferHiddenVolumeControls(false);

+ video.muted = false;

muteButton = mediaControlsButton(video, "mute-button");

volumeSlider = mediaControlsButton(video, "volume-slider");

// Make sure that both are visible.

- testExpected("getComputedStyle(muteButton).display", "none", '!=');

- testExpected("getComputedStyle(volumeSlider).display", "none", '!=');

+ assert_not_equals(getComputedStyle(muteButton).display, "none");

+ assert_not_equals(getComputedStyle(volumeSlider).display, "none");

- // Switch to muted video. Both should still be visible.

- run("video.muted = true");

- testExpected("getComputedStyle(muteButton).display", "none", '!=');

- testExpected("getComputedStyle(volumeSlider).display", "none", '!=');

+ // Switch to muted video. Both should still be visible.

+ video.muted = true;

+ assert_not_equals(getComputedStyle(muteButton).display, "none");

+ assert_not_equals(getComputedStyle(volumeSlider).display, "none");

- run("window.internals.settings.setPreferHiddenVolumeControls(true)");

+ internals.settings.setPreferHiddenVolumeControls(true);

// Switch back to unmuted video.

- run("video.muted = false");

- testExpected("getComputedStyle(muteButton).display", "none", '!=');

- testExpected("getComputedStyle(volumeSlider).display", "none", '==');

+ video.muted = false;

+ assert_not_equals(getComputedStyle(muteButton).display, "none");

+ assert_equals(getComputedStyle(volumeSlider).display, "none");

- // For muted video, the volume slider will hide but the mute

- // button should stay, since we always have it present for media

- // which have audio.

- run("video.muted = true");

- testExpected("getComputedStyle(muteButton).display", "none", '!=');

- testExpected("getComputedStyle(volumeSlider).display", "none", '==');

- endTest();

+ // For muted video, the volume slider will hide but the mute button

+ // should stay, since we always have it present for media which have audio.

+ video.muted = true;

+ assert_not_equals(getComputedStyle(muteButton).display, "none");

+ assert_equals(getComputedStyle(volumeSlider).display, "none");

});

-</script>

+ video.src = findMediaFile("video", "content/test");

+})

+</script>