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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment.html

Issue 1879353002: Convert track tests from video-test.js to testharness.js based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « third_party/WebKit/LayoutTests/media/track/track-cue-mutable-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment.html
diff --git a/third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment.html b/third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment.html
index ab2255f8da2bae401a4e7fca484a98e776a30c33..6b3487a11c93fb143497cb1ad581861c5c0a58d1 100644
--- a/third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment.html
+++ b/third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment.html
@@ -1,98 +1,86 @@
<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <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 src=../media-controls.js></script>
-
- <script>
-
- var testTrack;
- var testCue;
- var fragment;
-
- function createExpectedFragment(rootNode)
- {
- fragment = rootNode;
- fragment.appendChild(document.createTextNode("Lorem "));
-
- var bold = document.createElement("b");
- bold.appendChild(document.createTextNode("ipsum"));
- fragment.appendChild(bold);
-
- fragment.appendChild(document.createTextNode(" "));
-
- var underline = document.createElement("u");
- underline.appendChild(document.createTextNode("dolor"));
- fragment.appendChild(underline);
-
- fragment.appendChild(document.createTextNode(" "));
-
- var italics = document.createElement("i");
- italics.className = "sit";
- italics.appendChild(document.createTextNode("sit"));
- fragment.appendChild(italics);
-
- fragment.appendChild(document.createTextNode(" amet,"));
- }
-
- function testMutability()
- {
- run("testCue = testTrack.track.cues[0]");
-
- consoleWrite("<br>** Test initial cue contents");
- testExpected("testCue.text", "Lorem <b>ipsum</b> <u>dolor</u> <i.sit>sit</i> amet,");
-
- consoleWrite("<br>** Cue getCueAsHTML() should return a correct fragment");
- createExpectedFragment(document.createDocumentFragment());
- testExpected("fragment.isEqualNode(testCue.getCueAsHTML())", true);
-
- consoleWrite("<br>** Appending getCuesAsHTML() twice to the DOM should be succesful");
- run("document.getElementsByTagName('div')[0].appendChild(testCue.getCueAsHTML())");
- run("document.getElementsByTagName('div')[1].appendChild(testCue.getCueAsHTML())");
-
- createExpectedFragment(document.createElement('div'));
- testExpected("fragment.isEqualNode(document.getElementsByTagName('div')[0])", true);
- testExpected("fragment.isEqualNode(document.getElementsByTagName('div')[1])", true);
-
- consoleWrite("<br>** The fragment returned by getCuesAsHTML() should be independently mutable");
- run("document.getElementsByTagName('div')[0].firstChild.textContent = 'Different text '");
- testExpected("fragment.isEqualNode(document.getElementsByTagName('div')[0])", false);
- testExpected("fragment.isEqualNode(document.getElementsByTagName('div')[1])", true);
-
- consoleWrite("<br>** Calling twice getCueAsHTML() should not return the same fragment");
- testExpected("testCue.getCueAsHTML() == testCue.getCueAsHTML()", false);
-
- consoleWrite("");
- endTest();
- }
-
- function loaded()
- {
- findMediaElement();
- testTrack = document.querySelector('track');
-
- waitForEventsAndCall([[video, 'canplaythrough'], [testTrack, 'load']], testMutability);
-
- video.src = findMediaFile('video', '../content/counting');
- }
-
- </script>
- </head>
- <body onload="loaded()">
- <video controls >
- <track src="captions-webvtt/captions-html.vtt" kind="captions" default >
- </video>
- <p>Test that cue text is mutable.</p>
-
- <p>Fragment 1</p>
- <div></div>
-
- <p>Fragment 2</p>
- <div></div>
- </body>
-</html>
+<title>Test that cue fragment is mutable.</title>
+<script src="../media-file.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<style>
+p, div { display: none; }
+</style>
+<video>
+ <track src="captions-webvtt/captions-html.vtt" kind="captions" default >
+</video>
+<p>Fragment 1</p>
+<div></div>
+
+<p>Fragment 2</p>
+<div></div>
+<script>
+async_test(function(t) {
+ var video = document.querySelector("video");
+ var testTrack = document.querySelector("track");
+
+ video.oncanplaythrough = t.step_func(testMutability);
+ testTrack.onload = t.step_func(testMutability);
+
+ var fragment;
+ var eventCount = 0;
+ function testMutability() {
+ eventCount++;
+ if (eventCount != 2)
+ return;
+
+ var testCue = testTrack.track.cues[0];
+
+ // Test initial cue contents.
+ assert_equals(testCue.text, "Lorem <b>ipsum</b> <u>dolor</u> <i.sit>sit</i> amet,");
+
+ // Cue getCueAsHTML() should return a correct fragment.
+ createExpectedFragment(document.createDocumentFragment());
+ assert_true(fragment.isEqualNode(testCue.getCueAsHTML()));
+
+ // Appending getCuesAsHTML() twice to the DOM should be succesful.
+ document.getElementsByTagName("div")[0].appendChild(testCue.getCueAsHTML());
+ document.getElementsByTagName("div")[1].appendChild(testCue.getCueAsHTML());
+
+ createExpectedFragment(document.createElement("div"));
+ assert_true(fragment.isEqualNode(document.getElementsByTagName("div")[0]));
+ assert_true(fragment.isEqualNode(document.getElementsByTagName("div")[1]));
+
+ // The fragment returned by getCuesAsHTML() should be independently mutable.
+ document.getElementsByTagName("div")[0].firstChild.textContent = "Different text ";
+ assert_false(fragment.isEqualNode(document.getElementsByTagName("div")[0]));
+ assert_true(fragment.isEqualNode(document.getElementsByTagName("div")[1]));
+
+ // Calling twice getCueAsHTML() should not return the same fragment.
+ assert_false(testCue.getCueAsHTML() == testCue.getCueAsHTML());
mlamouri (slow - plz ping) 2016/04/19 15:10:20 assert_not_equals() ?
+
+ t.done();
+ }
+
+ function createExpectedFragment(rootNode) {
+ fragment = rootNode;
+ fragment.appendChild(document.createTextNode("Lorem "));
+
+ var bold = document.createElement("b");
+ bold.appendChild(document.createTextNode("ipsum"));
+ fragment.appendChild(bold);
+
+ fragment.appendChild(document.createTextNode(" "));
+
+ var underline = document.createElement("u");
+ underline.appendChild(document.createTextNode("dolor"));
+ fragment.appendChild(underline);
+
+ fragment.appendChild(document.createTextNode(" "));
+
+ var italics = document.createElement("i");
+ italics.className = "sit";
+ italics.appendChild(document.createTextNode("sit"));
+ fragment.appendChild(italics);
+
+ fragment.appendChild(document.createTextNode(" amet,"));
+ }
+
+ video.src = findMediaFile("video", "../content/counting");
+});
+</script>
« no previous file with comments | « third_party/WebKit/LayoutTests/media/track/track-cue-mutable-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/track-cue-mutable-fragment-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698