Update web-platform-tests to revision 3b3585e368841b77caea8576fa56cef91c3fbdf0

This commit is contained in:
Ms2ger 2016-09-26 10:52:50 +02:00
parent d00639c55f
commit 3b4f0ec0bb
541 changed files with 14609 additions and 3288 deletions

View file

@ -11,24 +11,23 @@ function runTest(config,qualifier) {
sessionTypes: [ 'temporary' ] };
async_test( function( test ) {
var _video = config.video,
_mediaKeys,
_mediaKeySession,
_mediaSource,
_allKeysUsableEvent = false,
_playingEvent = false,
_timeupdateEvent = false,
_events = [ ];
function onFailure(error) {
forceTestFailureFromPromise(test, error);
}
function onMessage(event) {
assert_equals( event.target, _mediaKeySession );
assert_true( event instanceof window.MediaKeyMessageEvent );
assert_equals( event.type, 'message');
assert_any( assert_equals,
event.messageType,
[ 'license-request', 'individualization-request' ] );
assert_in_array( event.messageType, [ 'license-request', 'individualization-request' ] );
if ( event.messageType !== 'individualization-request' ) {
_events.push( event.messageType );
@ -36,13 +35,10 @@ function runTest(config,qualifier) {
config.messagehandler( event.messageType, event.message ).then( function( response ) {
_events.push( 'license-response' );
waitForEventAndRunStep('keystatuseschange', _mediaKeySession, onKeyStatusesChange, test);
_mediaKeySession.update( response ).then( function() {
_events.push('updated');
}).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
}).catch(onFailure);
});
}
@ -50,24 +46,21 @@ function runTest(config,qualifier) {
assert_equals(event.target, _mediaKeySession );
assert_true(event instanceof window.Event );
assert_equals(event.type, 'keystatuseschange' );
var hasKeys = false, pendingKeys = false;
_mediaKeySession.keyStatuses.forEach( function( value, keyid ) {
assert_any( assert_equals, value, [ 'status-pending', 'usable' ] );
hasKeys = true;
pendingKeys = pendingKeys || ( value === 'status-pending' );
});
if ( !_allKeysUsableEvent && hasKeys && !pendingKeys ) {
_allKeysUsableEvent = true;
_events.push( 'allkeysusable' );
_video.setMediaKeys(_mediaKeys);
}
if ( !hasKeys ) {
_events.push( 'emptykeyslist' );
} else if (!pendingKeys ) {
_events.push( 'allkeysusable' );
_video.setMediaKeys(_mediaKeys).catch(onFailure);
} else {
assert_unreached('unexpected ' + event.type + ' event');
}
}
@ -80,17 +73,12 @@ function runTest(config,qualifier) {
_mediaKeySession.generateRequest( config.initData ? config.initDataType : event.initDataType,
config.initData || event.initData ).then( function() {
_events.push( 'generaterequest' );
}).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
}).catch(onFailure);
}
function onClosed(event) {
_events.push( 'closed-promise' );
setTimeout( test.step_func( function() {
assert_array_equals( _events,
[
'generaterequest',
@ -104,30 +92,23 @@ function runTest(config,qualifier) {
'emptykeyslist'
],
"Expected events sequence" );
_video.src = "";
_video.setMediaKeys( null ).then(function(){
test.done();
});
test.done();
} ), 0 );
}
function onTimeupdate(event) {
if ( _video.currentTime > ( config.duration || 2 ) && !_timeupdateEvent ) {
if ( _video.currentTime > ( config.duration || 1 ) && !_timeupdateEvent ) {
_timeupdateEvent = true;
_video.pause();
_mediaKeySession.closed.then( test.step_func( onClosed ) );
_mediaKeySession.close().then( function() {
_events.push( 'closed' );
}).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
}).catch(onFailure);
}
}
function onPlaying(event) {
_playingEvent = true;
_events.push( 'playing' );
// Not using waitForEventAndRunStep() to avoid too many
@ -149,8 +130,6 @@ function runTest(config,qualifier) {
_mediaSource = source;
_video.src = URL.createObjectURL(_mediaSource);
_video.play();
}).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
}).catch(onFailure);
}, testname);
}