third_party/WebKit/LayoutTests/media/track/track-webvtt-tc017-line-position.html - Issue 2012833002: Convert track-webvtt-tc[016-018] tests to testharness.js

Side by Side Diff: third_party/WebKit/LayoutTests/media/track/track-webvtt-tc017-line-position.html

Issue 2012833002: Convert track-webvtt-tc[016-018] tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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-tc016-align-positioning.html ('K') | « third_party/WebKit/LayoutTests/media/track/track-webvtt-tc016-align-positioning-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/track-webvtt-tc017-line-position-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/track-webvtt-tc018-align-text-line-position.html » ('J')
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 cue line position from settings.</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 <video>

	7 <track src="captions-webvtt/tc017-line-position.vtt">

	8 <track src="captions-webvtt/tc017-line-position-bad.vtt">

	9 </video>

	10 <script>

	11 async_test(function(t) {

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

5	13

6 <script src=../media-file.js></script>	14 var trackElements = document.querySelectorAll("track");

7 <!-- TODO(foolip): Convert test to testharness.js. crbug.com/588956	15 for (var i = 0; i < video.textTracks.length; i++)
	fs 2016/05/25 19:49:56 Same comment as in the previous test. Same comment as in the previous test. Srirama 2016/05/26 10:47:18 Done. Show quoted text On 2016/05/25 19:49:56, fs wrote: > Same comment as in the previous test. Done.
8 (Please avoid writing new tests using video-test.js) -->	16 trackElements[i].onload = t.step_func(trackLoaded);

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

10 <script>

11	17

12 var numberOfTrackTests = 2;	18 enableAllTextTracks(video.textTracks);

13	19

14 function trackLoaded()	20 var numberOfTracksLoaded = 0;

	21 function trackLoaded() {

	22 numberOfTracksLoaded++;

	23 if (numberOfTracksLoaded != 2)

	24 return;

	25

	26 testTrack(0);

	27 testTrackError(1);

	28 t.done();

	29 }

	30

	31 function testTrack(index) {

	32 var expected = [

15 {	33 {

16 numberOfTracksLoaded++;	34 line : 0,

17 if (numberOfTracksLoaded == numberOfTrackTests) {	35 snapToLines : false

18 testTrack(0);	36 },

19 testTrackError(1);	37 {

20 }	38 line : 0,

	39 snapToLines : true

	40 },

	41 {

	42 line : 50,

	43 snapToLines : false

	44 },

	45 {

	46 line : 5,

	47 snapToLines : true

	48 },

	49 {

	50 line : 100,

	51 snapToLines : false

	52 },

	53 {

	54 line : -1,

	55 snapToLines : true

	56 },

	57 {

	58 line : 500,

	59 snapToLines : true

21 }	60 }

	61 ];

22	62

23 function testTrack(i)	63 testCues(video.textTracks[index].cues, expected);
	fs 2016/05/25 19:49:56 With all these "compare various properties on cues With all these "compare various properties on cues" cases, maybe a slightly more generic version like: assert_cues_match(cues, expected, [ "line", "snapToLines" ]); which check the properties in the array, so approx: for (var property of propertyArray) assert_equals(cue[property], expected[property], property); instead of the hard-coded assert_equals. Could probably iterate the existing own properties on expected[i] too, but that's probably more generic than we need. Srirama 2016/05/26 10:47:18 Done. Show quoted text On 2016/05/25 19:49:56, fs wrote: > With all these "compare various properties on cues" cases, maybe a slightly more > generic version like: > > assert_cues_match(cues, expected, [ "line", "snapToLines" ]); > > which check the properties in the array, so approx: > > for (var property of propertyArray) > assert_equals(cue[property], expected[property], property); > > instead of the hard-coded assert_equals. > > Could probably iterate the existing own properties on expected[i] too, but > that's probably more generic than we need. Done.
	64 }

	65

	66 function testTrackError(index) {

	67 var expected = [

24 {	68 {

25 findMediaElement();	69 line : "auto",

26 var expected =	70 snapToLines : true

27 {	71 },

28 length : 7,	72 {

29 tests:	73 line : "auto",

30 [	74 snapToLines : true

31 {	75 },

32 property : "line",	76 {

33 values : [0, 0, 50, 5, 100, -1, 500],	77 line : "auto",

34 },	78 snapToLines : true

35 {	79 },

36 property : "snapToLines",	80 {

37 values : [false, true, false, true, false, true, tru e],	81 line : "auto",

38 },	82 snapToLines : true

39 ],	83 },

40 };	84 {

41 testCues(i, expected);	85 line : "auto",

	86 snapToLines : true

	87 },

	88 {

	89 line : "auto",

	90 snapToLines : true

	91 }

	92 ];

42	93

43 allTestsEnded();	94 testCues(video.textTracks[index].cues, expected);

44 }	95 }

45	96

46 function testTrackError(i)	97 function testCues(cues, expected) {

47 {	98 assert_equals(cues.length, expected.length);

48 findMediaElement();	99 for (var i = 0; i < cues.length; i++) {

49 var expected =	100 assert_equals(cues[i].line, expected[i].line);

50 {	101 assert_equals(cues[i].snapToLines, expected[i].snapToLines);

51 length : 6,	102 }

52 tests:	103 }

53 [	104 });

54 {	105 </script>

55 property : "line",

56 values : ["auto", "auto", "auto", "auto", "auto", "a uto", "auto"],

57 },

58 {

59 property : "snapToLines",

60 values : [true, true, true, true, true, true, true],

61 },

62 ],

63 };

64 testCues(i, expected);

65

66 allTestsEnded();

67 }

68 </script>

69 </head>

70 <body onload="enableAllTextTracks()">

71 <p>Tests cue line position from settings.</p>

72 <video>

73 <track src="captions-webvtt/tc017-line-position.vtt" onload="trackLo aded()">

74 <track src="captions-webvtt/tc017-line-position-bad.vtt" onload="tra ckLoaded()">

75 </video>

76 </body>

77 </html>

OLD	NEW