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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/track/track-add-remove-cue.html

Issue 1873093003: Convert track tests from video-test.js to testharness.js based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | third_party/WebKit/LayoutTests/media/track/track-add-remove-cue-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/track-add-track.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/media/track/track-add-remove-cue.html
diff --git a/third_party/WebKit/LayoutTests/media/track/track-add-remove-cue.html b/third_party/WebKit/LayoutTests/media/track/track-add-remove-cue.html
index 656a77cb5f79804f490d6e2c483443d0e8136ec3..72f2042eb933dd36faf22e10ebad81bde97c193c 100644
--- a/third_party/WebKit/LayoutTests/media/track/track-add-remove-cue.html
+++ b/third_party/WebKit/LayoutTests/media/track/track-add-remove-cue.html
@@ -1,103 +1,82 @@
<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Tests TextTrack's addCue and removeCue.</title>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script>
+async_test(function(t) {
+ var video = document.createElement("video");
+ var trackElement = document.createElement("track");
- <script src=../media-file.js></script>
- <!-- TODO(philipj): Convert test to testharness.js. crbug.com/588956
- (Please avoid writing new tests using video-test.js) -->
- <script src=../video-test.js></script>
- <script>
+ trackElement.onload = t.step_func_done(function() {
+ var cues = trackElement.track.cues;
+ assert_equals(cues.length, 4);
+ assert_equals(cues.getCueById("1").startTime, 0);
+ assert_equals(cues[1].startTime, 31);
+ assert_equals(cues[2].startTime, 61);
+ assert_equals(cues.getCueById("4").startTime, 121);
+ assert_object_equals(cues.getCueById("junk"), undefined);
- var cues;
+ var textCue = new VTTCue(33, 3.4, "Sausage?");
+ assert_equals(textCue.track, null);
+ assert_equals(textCue.id, "");
+ assert_equals(textCue.startTime, 33);
+ assert_equals(textCue.endTime, 3.4);
+ assert_equals(textCue.pauseOnExit, false);
+ assert_equals(textCue.vertical, "");
+ assert_equals(textCue.snapToLines, true);
+ assert_equals(textCue.line, "auto");
+ assert_equals(textCue.position, "auto");
+ assert_equals(textCue.size, 100);
+ assert_equals(textCue.align, "middle");
- function trackLoaded()
- {
- var testTrack = document.getElementById('testTrack');
- cues = testTrack.track.cues;
+ assert_throws("NotFoundError", function() { trackElement.track.removeCue(textCue); });
- consoleWrite("<br>*** Test cues loaded from the file.");
philipj_slow 2016/04/11 12:34:00 Can you add back these consoleWrite things as comm
Srirama 2016/04/11 13:34:24 Done.
- testExpected("cues.length", 4);
- testExpected("cues.getCueById('1').startTime", 0);
- testExpected("cues[1].startTime", 31);
- testExpected("cues[2].startTime", 61);
- testExpected("cues.getCueById('4').startTime", 121);
- testExpected("cues.getCueById('junk')", undefined);
+ trackElement.track.addCue(textCue);
+ assert_equals(textCue.track, trackElement.track);
+ assert_equals(cues[1].startTime, 31);
+ assert_equals(cues[2].startTime, 33);
+ assert_equals(cues[3].startTime, 61);
- consoleWrite("<br>*** Create a new cue, check values");
- run("textCue = new VTTCue(33, 3.4, 'Sausage?')");
- testExpected("textCue.track", null);
- testExpected("textCue.id", '');
- testExpected("textCue.startTime", 33);
- testExpected("textCue.endTime", 3.4);
- testExpected("textCue.pauseOnExit", false);
- testExpected("textCue.vertical", "");
- testExpected("textCue.snapToLines", true);
- testExpected("textCue.line", "auto");
- testExpected("textCue.position", "auto");
- testExpected("textCue.size", 100);
- testExpected("textCue.align", "middle");
+ var newTrack = video.addTextTrack("subtitles", "French subtitles", "fr");
+ newTrack.mode = "showing";
+ newTrack.addCue(new VTTCue(0, 1, "Test!"));
+ var newCue = newTrack.cues[0];
philipj_slow 2016/04/11 12:34:00 This could be simpler I think by just assigning ne
Srirama 2016/04/11 13:34:24 Done.
+ assert_equals(newCue.track, newTrack);
+ assert_equals(newCue.id, "");
+ assert_equals(newCue.startTime, 0);
+ assert_equals(newCue.endTime, 1);
+ assert_equals(newCue.pauseOnExit, false);
+ assert_equals(newCue.vertical, "");
+ assert_equals(newCue.snapToLines, true);
+ assert_equals(newCue.line, "auto");
+ assert_equals(newCue.position, "auto");
+ assert_equals(newCue.size, 100);
+ assert_equals(newCue.align, "middle");
- consoleWrite("<br>*** Remove the unadded track, make sure it throws correctly.");
- testException("testTrack.track.removeCue(textCue)", '"NotFoundError: Failed to execute \'removeCue\' on \'TextTrack\': The specified cue is not listed in the TextTrack\'s list of cues."');
+ trackElement.track.removeCue(textCue);
+ assert_equals(textCue.track, null);
+ assert_equals(cues[1].startTime, 31);
+ assert_equals(cues[2].startTime, 61);
- consoleWrite("<br>*** Add the new cue to a track, make sure it is inserted correctly.");
- run("testTrack.track.addCue(textCue)");
- testExpected("textCue.track", testTrack.track);
- testExpected("cues[1].startTime", 31);
- testExpected("cues[2].startTime", 33);
- testExpected("cues[3].startTime", 61);
+ textCue = cues[2];
+ trackElement.track.removeCue(textCue);
+ assert_equals(textCue.track, null);
+ assert_equals(cues[1].startTime, 31);
+ assert_equals(cues[2].startTime, 121);
- consoleWrite("<br>*** create a new cue and add it to a track created with video.addTextTrack, make sure it is inserted correctly.");
- findMediaElement();
- run('newTrack = video.addTextTrack("subtitles", "French subtitles", "fr")');
- run('newTrack.mode = "showing"');
- run('newTrack.addCue(new VTTCue(0.0, 1.0, "Test!"))');
- run('newCue = newTrack.cues[0]');
- testExpected("newCue.track", newTrack);
- testExpected("newCue.id", "");
- testExpected("newCue.startTime", 0.0);
- testExpected("newCue.endTime", 1.0);
- testExpected("newCue.pauseOnExit", false);
- testExpected("newCue.vertical", "");
- testExpected("newCue.snapToLines", true);
- testExpected("newCue.line", "auto");
- testExpected("newCue.position", "auto");
- testExpected("newCue.size", 100);
- testExpected("newCue.align", "middle");
+ assert_throws("NotFoundError", function() { trackElement.track.removeCue(textCue); });
- consoleWrite("<br>*** Remove a cue created with addCue().");
- run("testTrack.track.removeCue(textCue)");
- testExpected("textCue.track", null);
- testExpected("cues[1].startTime", 31);
- testExpected("cues[2].startTime", 61);
+ trackElement.track.addCue(new VTTCue(0, 31, "I am first"));
+ assert_equals(cues[0].startTime, 0);
+ assert_equals(cues[0].endTime, 31);
+ assert_equals(cues[1].startTime, 0);
+ assert_equals(cues[1].endTime, 30.5);
+ assert_equals(cues[2].startTime, 31);
+ });
- consoleWrite("<br>*** Remove a cue added from the WebVTT file.");
- run("textCue = cues[2]");
- run("testTrack.track.removeCue(textCue)");
- testExpected("textCue.track", null);
- testExpected("cues[1].startTime", 31);
- testExpected("cues[2].startTime", 121);
-
- consoleWrite("<br>*** Try to remove the cue again.");
- testDOMException("testTrack.track.removeCue(textCue)", "DOMException.NOT_FOUND_ERR");
-
- consoleWrite("<br>*** Add a cue before all the existing cues.");
- run("testTrack.track.addCue(new VTTCue(0, 31, 'I am first'))");
- testExpected("cues[0].startTime", 0);
- testExpected("cues[0].endTime", 31);
- testExpected("cues[1].startTime", 0);
- testExpected("cues[1].endTime", 30.5);
- testExpected("cues[2].startTime", 31);
- endTest();
- }
-
- </script>
- </head>
- <body>
- <p>Tests TextTrack's addCue and removeCue</p>
- <video>
- <track id="testTrack" src="captions-webvtt/tc013-settings.vtt" kind="captions" onload="trackLoaded()" default>
- </video>
- </body>
-</html>
+ trackElement.src = "captions-webvtt/tc013-settings.vtt";
+ trackElement.kind = "captions";
+ trackElement.default = true;
+ video.appendChild(trackElement);
+});
+</script>
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/media/track/track-add-remove-cue-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/track-add-track.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698