LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back.html - Issue 20114005: Layout Test for basic MSE seek scenario.

Side by Side Diff: LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back.html

Issue 20114005: Layout Test for basic MSE seek scenario. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Confirm that seeked and timeupdate actually fired, before checking play. Created 7 years, 4 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

« no previous file with comments | « no previous file | LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back-expected.txt » ('j') | LayoutTests/http/tests/media/media-source/mediasource-util.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <!DOCTYPE html>

	2 <html>

	3 <head>

	4 <script src="/w3c/resources/testharness.js"></script>

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

	6 <script src="mediasource-util.js"></script>

	7 <script src="/media/resources/media-source/webm/segment-info.js"></scrip t>

	8 <link rel="stylesheet" href="/w3c/resources/testharness.css">

	9 </head>

	10 <body>

	11 <div id='log'></div>

	12

	13 <script>

	14

	15 function seekBackAfterPlayingTest(testFunction, description, options )

	16 {

	17 mediasource_test(function(test, mediaElement, mediaSource)

	18 {

	19 var segmentInfo = WebMSegmentInfo.testWebM;

	20 assert_equals(segmentInfo.duration, 6.042, 'Expected test me dia duration');

	21 test.failOnEvent(mediaElement, 'error');

	22

	23 var sourceBuffer = mediaSource.addSourceBuffer(segmentInfo.t ype);

	24 MediaSourceUtil.loadBinaryData(test, segmentInfo.url, functi on(mediaData)

	25 {

	26 testFunction(test, mediaElement, mediaSource, segmentInf o, sourceBuffer, mediaData);

	27 });

	28 }, description, options);

	29 }

	30

	31 seekBackAfterPlayingTest(function(test, mediaElement, mediaSource, s egmentInfo, sourceBuffer, mediaData)

	32 {

	33

	34 mediaElement.play();

	35 // Append all the segments

	36 test.expectEvent(sourceBuffer, 'updateend', 'sourceBuffer');

	37 test.expectEvent(mediaElement, 'playing', 'Playing triggered');

	38 sourceBuffer.appendBuffer(mediaData);

	39

	40 var confirmPlayAfterSeek = test.step_func(function(){
	wolenetz 2013/08/02 23:06:45 nit: { on next line. nit: { on next line. anandc 2013/08/02 23:46:43 Done. Show quoted text On 2013/08/02 23:06:45, wolenetz wrote: > nit: { on next line. Done.
	41 test.waitForExpectedEvents(function()

	42 {

	43 var delayedPlayAfterSeekHandler = test.step_func(functio n()

	44 {

	45 assert_greater_than(mediaElement.currentTime, 0.0, 'Pl ayback has started after seek.');
	wolenetz 2013/08/02 23:06:45 nit: indent 4. hmm. I missed this one earlier, too nit: indent 4. hmm. I missed this one earlier, too :) anandc 2013/08/02 23:46:43 Done. Show quoted text On 2013/08/02 23:06:45, wolenetz wrote: > nit: indent 4. hmm. I missed this one earlier, too :) Done.
	46 test.done();

	47 });

	48 test.expectDelayedCallback(delayedPlayAfterSeekHandler, 300);

	49 });

	50 });

	51

	52 var seekAndPlayAgain = test.step_func(function(){

	53 test.waitForExpectedEvents(function()

	54 {

	55 assert_true(mediaElement.seeking, 'mediaElement is seeki ng');

	56 assert_equals(mediaElement.currentTime, 0.0, 'Current ti me is 0.0');

	57 test.expectEvent(mediaElement, 'timeupdate', 'timeupdate fired.');

	58 test.expectEvent(mediaElement, 'seeked', 'mediaElement f inished seek');

	59

	60 confirmPlayAfterSeek();
	wolenetz 2013/08/02 23:06:45 low-pri nit: (like below; read the next comment fi low-pri nit: (like below; read the next comment first for better context...) Wrap this call inside test.waitForExpectedEvents (move the wait here from confirmPlayAfterSeek). Also, change the name from confirmPlayAfterSeek to confirmPlayThenEnd. Maybe also change delayedPlayAfterSeekHandler to be just delayedPlayHandlerThatEnds (or somesuch...) anandc 2013/08/02 23:46:43 Done. Show quoted text On 2013/08/02 23:06:45, wolenetz wrote: > low-pri nit: (like below; read the next comment first for better context...) > Wrap this call inside test.waitForExpectedEvents (move the wait here from > confirmPlayAfterSeek). Also, change the name from confirmPlayAfterSeek to > confirmPlayThenEnd. Maybe also change delayedPlayAfterSeekHandler to be just > delayedPlayHandlerThatEnds (or somesuch...) Done.
	61 });

	62 });

	63

	64 var delayedPlayHandler = test.step_func(function()

	65 {

	66 assert_greater_than(mediaElement.currentTime, 0.0, 'Playback has started.');

	67 test.expectEvent(mediaElement, 'seeking', 'mediaElement');

	68 mediaElement.currentTime = 0.0;

	69

	70 seekAndPlayAgain();
	wolenetz 2013/08/02 23:06:45 low-pri nit: Wrap this call inside test.waitForExp low-pri nit: Wrap this call inside test.waitForExpectedEvents (move the wait here from seekAndPlayAgain()). And/or, maybe rename seekAndPlayAgain() to be finishSeekThenPlay? Otherwise, it's unclear when the seek is actually started (it's started when delayedPlayHandler sets currentTime, not in seekAndPlayAgain()). Maybe even do something like: test.waitForExpectedEvents(function(){finishSeekThen(confirmPlayAfterSeek);}); And change the call in confirmPlayAfterSeek to chain to the passed-in function instead. anandc 2013/08/02 23:46:43 Done. Show quoted text On 2013/08/02 23:06:45, wolenetz wrote: > low-pri nit: Wrap this call inside test.waitForExpectedEvents (move the wait > here from seekAndPlayAgain()). And/or, maybe rename seekAndPlayAgain() to be > finishSeekThenPlay? Otherwise, it's unclear when the seek is actually started > (it's started when delayedPlayHandler sets currentTime, not in > seekAndPlayAgain()). > > Maybe even do something like: > test.waitForExpectedEvents(function(){finishSeekThen(confirmPlayAfterSeek);}); > And change the call in confirmPlayAfterSeek to chain to the passed-in function > instead. Done. anandc 2013/08/02 23:49:11 Done the first part. Didn't chain calls. Maybe for Show quoted text On 2013/08/02 23:06:45, wolenetz wrote: > low-pri nit: Wrap this call inside test.waitForExpectedEvents (move the wait > here from seekAndPlayAgain()). And/or, maybe rename seekAndPlayAgain() to be > finishSeekThenPlay? Otherwise, it's unclear when the seek is actually started > (it's started when delayedPlayHandler sets currentTime, not in > seekAndPlayAgain()). > > Maybe even do something like: > test.waitForExpectedEvents(function(){finishSeekThen(confirmPlayAfterSeek);}); > And change the call in confirmPlayAfterSeek to chain to the passed-in function > instead. Done the first part. Didn't chain calls. Maybe for future rounds? wolenetz 2013/08/03 00:06:28 looks good. chaining was just an idea for readabil Show quoted text On 2013/08/02 23:49:11, anandc wrote: > On 2013/08/02 23:06:45, wolenetz wrote: > > low-pri nit: Wrap this call inside test.waitForExpectedEvents (move the wait > > here from seekAndPlayAgain()). And/or, maybe rename seekAndPlayAgain() to be > > finishSeekThenPlay? Otherwise, it's unclear when the seek is actually started > > (it's started when delayedPlayHandler sets currentTime, not in > > seekAndPlayAgain()). > > > > Maybe even do something like: > > test.waitForExpectedEvents(function(){finishSeekThen(confirmPlayAfterSeek);}); > > And change the call in confirmPlayAfterSeek to chain to the passed-in function > > instead. > Done the first part. Didn't chain calls. Maybe for future rounds? looks good. chaining was just an idea for readability. thanks!
	71 });

	72

	73 test.waitForExpectedEvents(function()

	74 {

	75 test.expectDelayedCallback(delayedPlayHandler, 300);

	76 });

	77

	78 }, 'Test playing then seeking back.');

	79 </script>

	80 </body>

	81 </html>

OLD	NEW