third_party/WebKit/LayoutTests/media/track/track-webvtt-tc028-unsupported-markup.html - Issue 2030383002: Convert track-webvtt-tc[027-029] tests to testharness.js

Side by Side Diff: third_party/WebKit/LayoutTests/media/track/track-webvtt-tc028-unsupported-markup.html

Issue 2030383002: Convert track-webvtt-tc[027-029] 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 unified diff | Download patch

« third_party/WebKit/LayoutTests/media/track/track-webvtt-tc027-empty-cue-expected.txt ('K') | « third_party/WebKit/LayoutTests/media/track/track-webvtt-tc027-empty-cue-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/track-webvtt-tc028-unsupported-markup-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <title>Tests that unsupported markup is properly ignored.</title>

3 <head>	3 <script src="track-helpers.js"></script>

4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	4 <script src="../../resources/testharness.js"></script>

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

	6 <script>

	7 check_cues_from_track("captions-webvtt/tc028-unsupported-markup.vtt", function(t rack) {

	8 var expected = [

	9 {

	10 innerHTML: "Bear is Coming!!!!!\nAnd what kind of a bear it is - jus t have look.",

	11 text: "<h1>Bear is Coming!!!!!</h1>\n<p>And what kind of a bear it i s - just have <a href=\"webpage.html\">look</a>.</p>"

	12 },

	13 {

	14 innerHTML: "\n I said Bear is coming!!!!\n I said Bear is still co ming!!!!\n",

	15 text: "<ul>\n <li>I said Bear is coming!!!!</li>\n <li>I said Bear is still coming!!!!</li>\n</ul>"

	16 },

	17 {

	18 innerHTML: "\n I said Bear is coming now!!!!\n \n \n",

	19 text: "<ol>\n <li>I said Bear is coming now!!!!</li>\n <li><img sr c=\"bear.png\" alt=\"mighty bear\"></li>\n <li><video src=\"bear_ad.webm\" cont rols></video></li>\n</ol>"

	20 }

	21 ];

5	22

6 <script src=../media-file.js></script>	23 var cues = track.cues;

7 <!-- TODO(foolip): Convert test to testharness.js. crbug.com/588956	24 assert_equals(cues.length, expected.length);

8 (Please avoid writing new tests using video-test.js) -->	25 for (var i = 0; i < cues.length; i++) {

9 <script src=../video-test.js></script>	26 assert_equals(cues[i].getCueAsHTML().textContent, expected[i].innerHTML) ;
	Srirama 2016/06/03 14:09:29 Can this test also be written in a better way like Can this test also be written in a better way like previous tests? fs 2016/06/03 14:37:16 I think that depends on how convoluted we want to Show quoted text On 2016/06/03 at 14:09:29, Srirama wrote: > Can this test also be written in a better way like previous tests? I think that depends on how convoluted we want to make assert_cues_match =). I guess allow specifying an object as the 'value' part of the list and then have: if (expectedItem[property] instanceof Object) assert_equals(expectedItem[property].extractor(cue), expectedItem[property].expected); else assert_equals(...); // like before. I.e have entries like: { extractor: cue => { return cue.getCueAsHTML().textContent; }, "..." } This test would probably be better off in something like what LayoutTests/media/track/opera/track/webvtt/parsing-cue-data/common.js does. The way it is written now I'm not sure it even tests what it sets out to test... Also, I'm fine with punting on any "fancy" stuff. Srirama 2016/06/03 17:54:23 Thanks, looks like there is lot of stuff that i ne Show quoted text On 2016/06/03 14:37:16, fs wrote: > On 2016/06/03 at 14:09:29, Srirama wrote: > > Can this test also be written in a better way like previous tests? > > I think that depends on how convoluted we want to make assert_cues_match =). I > guess allow specifying an object as the 'value' part of the list and then have: > > if (expectedItem[property] instanceof Object) > assert_equals(expectedItem[property].extractor(cue), > expectedItem[property].expected); > else > assert_equals(...); // like before. > > I.e have entries like: > > { extractor: cue => { return cue.getCueAsHTML().textContent; }, "..." } > > This test would probably be better off in something like what > LayoutTests/media/track/opera/track/webvtt/parsing-cue-data/common.js does. The > way it is written now I'm not sure it even tests what it sets out to test... > > Also, I'm fine with punting on any "fancy" stuff. Thanks, looks like there is lot of stuff that i need to learn. I will revisit this again. For now i am adding a TODO.
10 <script>	27 assert_equals(cues[i].text, expected[i].text);

11	28 }

12 function trackLoaded()	29 });

13 {	30 </script>

14 findMediaElement();

15 var expected =

16 {

17 length : 3,

18 tests:

19 [

20 {

21 property : "getCueAsHTML().textContent",

22 values : ["Bear is Coming!!!!!\nAnd what kind of a b ear it is - just have look.",

23 "\n I said Bear is coming!!!!\n I said B ear is still coming!!!!\n",

24 "\n I said Bear is coming now!!!!\n \n \n"],

25 },

26 {

27 property : "text",

28 values : ["<h1>Bear is Coming!!!!!</h1>\n<p>And what kind of a bear it is - just have <a href=\"webpage.html\">look</a>.</p>",

29 "<ul>\n <li>I said Bear is coming!!!!</li >\n <li>I said Bear is still coming!!!!</li>\n</ul>",

30 "<ol>\n <li>I said Bear is coming now!!!! </li>\n <li><img src=\"bear.png\" alt=\"mighty bear\"></li>\n <li><video src=\ "bear_ad.webm\" controls></video></li>\n</ol>"],

31 },

32 ],

33 };

34 testCues(0, expected);

35

36 endTest();

37 }

38

39 </script>

40 </head>

41 <body>

42 <p>Tests that unsupported markup is properly ignored.</p>

43 <video>

44 <track src="captions-webvtt/tc028-unsupported-markup.vtt" onload="tr ackLoaded()" default>

45 </video>

46 </body>

47 </html>

OLD	NEW