Chromium Code Reviews Chromium Code Reviews
Issue 2021693002:
Convert controls-* tests to testharness.js (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: third_party/WebKit/LayoutTests/media/controls-volume-slider-keynav.html |
| diff --git a/third_party/WebKit/LayoutTests/media/controls-volume-slider-keynav.html b/third_party/WebKit/LayoutTests/media/controls-volume-slider-keynav.html |
| index 74f556f45b919c53998ed0ddef7fdea16c0a512e..659305c053222bc0ad740bce9b00cd941a3aab59 100644 |
| --- a/third_party/WebKit/LayoutTests/media/controls-volume-slider-keynav.html |
| +++ b/third_party/WebKit/LayoutTests/media/controls-volume-slider-keynav.html |
| @@ -1,43 +1,38 @@ |
| -<!doctype html> |
| -<html> |
| - <head> |
| - <title>media controls volume slider keyboard navigation</title> |
| - <script src="media-file.js"></script> |
| - <script src="media-controls.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> |
| - </head> |
| - <body> |
| - <audio controls></audio> |
| - <script> |
| - findMediaElement(); |
| - audio.src = findMediaFile("audio", "content/test"); |
| - testExpected("audio.volume", 1); |
| - waitForEvent("loadedmetadata", function() |
| - { |
| - // Focus the volume slider. |
| - var button = mediaControlsButton(audio, "volume-slider"); |
| - button.focus(); |
| +<!DOCTYPE html> |
| +<title>Test media controls volume slider keyboard navigation</title> |
| +<script src="../resources/testharness.js"></script> |
| +<script src="../resources/testharnessreport.js"></script> |
| +<script src="media-file.js"></script> |
| +<script src="media-controls.js"></script> |
| +<audio controls></audio> |
| +<script> |
| +async_test(function(t) { |
| + var audio = document.querySelector("audio"); |
| + audio.src = findMediaFile("audio", "content/test"); |
| + assert_equals(audio.volume, 1); |
| - // 'Left' reduces volume. |
| - eventSender.keyDown('leftArrow'); |
| - testExpected("audio.volume", 1, '<'); |
| + audio.onloadedmetadata = t.step_func(function() { |
| + // Focus the volume slider. |
| + var button = mediaControlsButton(audio, "volume-slider"); |
| + button.focus(); |
|
fs
2016/05/29 14:52:43
Nit: These two lines could be merged.
Srirama
2016/05/30 07:55:14
Done.
|
| - // 'Right' reduces volume (same step as 'Left', but opposite sign). |
| - eventSender.keyDown('rightArrow'); |
| - testExpected("audio.volume", 1); |
| + // 'Left' reduces volume. |
| + eventSender.keyDown("leftArrow"); |
| + assert_less_than(audio.volume, 1); |
| - // 'Home' sets minimum volume (0). |
| - eventSender.keyDown('home'); |
| - testExpected("audio.volume", 0); |
| + // 'Right' increases volume (same step as 'Left', but opposite sign). |
| + eventSender.keyDown("rightArrow"); |
| + assert_equals(audio.volume, 1); |
| - // 'End' sets maximum volume (1). |
| - eventSender.keyDown('end'); |
| - testExpected("audio.volume", 1); |
| + // 'Home' sets minimum volume (0). |
| + eventSender.keyDown("home"); |
| + assert_equals(audio.volume, 0); |
| - waitForEventAndEnd("volumechange"); |
| - }); |
| - </script> |
| - </body> |
| -</html> |
| + // 'End' sets maximum volume (1). |
| + eventSender.keyDown("end"); |
| + assert_equals(audio.volume, 1); |
| + |
| + audio.onvolumechange = t.step_func_done(); |
| + }); |
| +}); |
| +</script> |
