Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision e8bfc205e36ad699601212cd50083870bad9a75d

Browse source
This commit is contained in:
Ms2ger 2016-11-14 11:07:09 +01:00
parent 65dd6d4340
commit ccdb0a3458
1428 changed files with 118036 additions and 9786 deletions
Download patch file Download diff file Expand all files Collapse all files

62
tests/wpt/web-platform-tests/encrypted-media/scripts/keystatuses-multiple-sessions.js
View file

@ -1,10 +1,10 @@
function runTest(config,qualifier)
{
var testname = testnamePrefix( qualifier, config.keysystem ) + ', temporary, keystatuses, multiple sessions';
var testname = testnamePrefix(qualifier, config.keysystem) + ', temporary, keystatuses, multiple sessions';
var configuration = getSimpleConfigurationForContent( config.content );
var configuration = getSimpleConfigurationForContent(config.content);
if ( config.initDataType && config.initData ) configuration.initDataTypes = [ config.initDataType ];
if (config.initDataType && config.initData) configuration.initDataTypes = [config.initDataType];
async_test(function(test)
{
@ -13,8 +13,14 @@ function runTest(config,qualifier)
// Even though key ids are uint8, using printable values so that
// they can be verified easily.
var key1 = new Uint8Array( config.content.keys[ 0 ].kid ),
key2 = new Uint8Array( config.content.keys[ 1 ].kid );
var key1 = new Uint8Array(config.content.keys[0].kid),
key2 = new Uint8Array(config.content.keys[1].kid),
variant1 = config.content.keys[0].variantId,
variant2 = config.content.keys[1].variantId;
function onFailure(error) {
forceTestFailureFromPromise(test,error);
}
function processMessage1(event)
{
@ -22,15 +28,12 @@ function runTest(config,qualifier)
assert_equals(event.target, mediaKeySession1);
// No keys added yet.
verifyKeyStatuses(mediaKeySession1.keyStatuses, { expected: [], unexpected: [key1, key2] });
verifyKeyStatuses(mediaKeySession1.keyStatuses, {expected: [], unexpected: [key1, key2]});
// Add key1 to session1.
config.messagehandler( event.messageType, event.message ).then( function( response ) {
event.target.update( response ).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
});
config.messagehandler(event.messageType, event.message, {variantId:variant1}).then(function(response) {
return event.target.update(response);
}).catch(onFailure);
}
@ -40,12 +43,10 @@ function runTest(config,qualifier)
assert_equals(event.target, mediaKeySession1);
// Check that keyStatuses contains the expected key1 only.
verifyKeyStatuses(mediaKeySession1.keyStatuses, { expected: [key1], unexpected: [key2] });
verifyKeyStatuses(mediaKeySession1.keyStatuses, {expected: [key1], unexpected: [key2]});
// Now trigger a message event on session2.
mediaKeySession2.generateRequest(config.initDataType, config.initData[ 1 ]).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
mediaKeySession2.generateRequest(config.initDataType, config.initData[1]).catch(onFailure);
}
function processMessage2(event)
@ -54,18 +55,15 @@ function runTest(config,qualifier)
assert_equals(event.target, mediaKeySession2);
// session2 has no keys added yet.
verifyKeyStatuses(mediaKeySession2.keyStatuses, { expected: [], unexpected: [key1, key2] });
verifyKeyStatuses(mediaKeySession2.keyStatuses, {expected: [], unexpected: [key1, key2]});
// session1 should still have 1 key.
verifyKeyStatuses(mediaKeySession1.keyStatuses, { expected: [key1], unexpected: [key2] });
verifyKeyStatuses(mediaKeySession1.keyStatuses, {expected: [key1], unexpected: [key2]});
// Add key2 to session2.
config.messagehandler( event.messageType, event.message ).then( function( response ) {
event.target.update( response ).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
});
config.messagehandler(event.messageType, event.message, {variantId:variant2}).then(function(response) {
return event.target.update(response);
}).catch(onFailure);
}
function processKeyStatusesChange2(event)
@ -74,23 +72,23 @@ function runTest(config,qualifier)
assert_equals(event.target, mediaKeySession2);
// Check that keyStatuses contains the expected key2 only.
verifyKeyStatuses(mediaKeySession2.keyStatuses, { expected: [key2], unexpected: [key1] });
verifyKeyStatuses(mediaKeySession2.keyStatuses, {expected: [key2], unexpected: [key1]});
// session1 should still have 1 key.
verifyKeyStatuses(mediaKeySession1.keyStatuses, { expected: [key1], unexpected: [key2] });
verifyKeyStatuses(mediaKeySession1.keyStatuses, {expected: [key1], unexpected: [key2]});
test.done();
}
navigator.requestMediaKeySystemAccess( config.keysystem, [ configuration ] ).then(function(access) {
navigator.requestMediaKeySystemAccess(config.keysystem, [configuration]).then(function(access) {
return access.createMediaKeys();
}).then(function(mediaKeys) {
mediaKeySession1 = mediaKeys.createSession();
mediaKeySession2 = mediaKeys.createSession();
// There should be no keys defined on either session.
verifyKeyStatuses(mediaKeySession1.keyStatuses, { expected: [], unexpected: [key1, key2] });
verifyKeyStatuses(mediaKeySession2.keyStatuses, { expected: [], unexpected: [key1, key2] });
verifyKeyStatuses(mediaKeySession1.keyStatuses, {expected: [], unexpected: [key1, key2]});
verifyKeyStatuses(mediaKeySession2.keyStatuses, {expected: [], unexpected: [key1, key2]});
// Bind all the event handlers now.
waitForEventAndRunStep('message', mediaKeySession1, processMessage1, test);
@ -99,9 +97,7 @@ function runTest(config,qualifier)
waitForEventAndRunStep('keystatuseschange', mediaKeySession2, processKeyStatusesChange2, test);
// Generate a request on session1.
return mediaKeySession1.generateRequest(config.initDataType, config.initData[ 0 ] );
}).catch(function(error) {
forceTestFailureFromPromise(test, error);
});
return mediaKeySession1.generateRequest(config.initDataType, config.initData[0]);
}).catch(onFailure);
}, testname );
}