mirror of
https://github.com/servo/servo.git
synced 2025-08-20 21:05:34 +01:00
Update web-platform-tests to revision e8bfc205e36ad699601212cd50083870bad9a75d
This commit is contained in:
Ms2ger
parent
65dd6d4340
commit
ccdb0a3458
1428 changed files with 118036 additions and 9786 deletions
|
|
@ -41,4 +41,24 @@ MessageHandler.prototype.messagehandler = function messagehandler( messageType,
|
|||
}
|
||||
|
||||
throw new TypeError( 'Unsupported message type for ClearKey' );
|
||||
};
|
||||
|
||||
MessageHandler.prototype.createJWKSet = function createJWKSet(keyId, key) {
|
||||
var jwkSet = '{"keys":[';
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
if (i != 0)
|
||||
jwkSet += ',';
|
||||
jwkSet += arguments[i];
|
||||
}
|
||||
jwkSet += ']}';
|
||||
return jwkSet;
|
||||
};
|
||||
|
||||
MessageHandler.prototype.createJWK = function createJWK(keyId, key) {
|
||||
var jwk = '{"kty":"oct","alg":"A128KW","kid":"';
|
||||
jwk += base64urlEncode(keyId);
|
||||
jwk += '","k":"';
|
||||
jwk += base64urlEncode(key);
|
||||
jwk += '"}';
|
||||
return jwk;
|
||||
};
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
(function(){
|
||||
// Expect utf8decoder and utf8decoder to be TextEncoder('utf-8') and TextDecoder('utf-8') respectively
|
||||
//
|
||||
// drmconfig format:
|
||||
|
|
@ -7,11 +8,14 @@
|
|||
// "certificate" : <base64 encoded server certificate> } }
|
||||
//
|
||||
|
||||
drmtodaysecret = Uint8Array.from( [144, 34, 109, 76, 134, 7, 97, 107, 98, 251, 140, 28, 98, 79, 153, 222, 231, 245, 154, 226, 193, 1, 213, 207, 152, 204, 144, 15, 13, 2, 37, 236] );
|
||||
|
||||
drmconfig = {
|
||||
"com.widevine.alpha": [ {
|
||||
"serverURL": "https://lic.staging.drmtoday.com/license-proxy-widevine/cenc/",
|
||||
"servertype" : "drmtoday",
|
||||
"merchant" : "w3c-eme-test",
|
||||
"secret" : drmtodaysecret
|
||||
} ],
|
||||
"com.microsoft.playready": [ {
|
||||
"serverURL": "http://playready-testserver.azurewebsites.net/rightsmanager.asmx",
|
||||
|
|
@ -29,205 +33,230 @@ drmconfig = {
|
|||
"serverURL": "https://lic.staging.drmtoday.com/license-proxy-headerauth/drmtoday/RightsManager.asmx",
|
||||
"servertype" : "drmtoday",
|
||||
"sessionTypes" : [ "temporary", "persistent-usage-record", "persistent-license" ],
|
||||
"merchant" : "w3c-eme-test"
|
||||
"merchant" : "w3c-eme-test",
|
||||
"secret" : drmtodaysecret
|
||||
} ]
|
||||
};
|
||||
|
||||
function MessageHandler( keysystem, content, sessionType ) {
|
||||
|
||||
var keySystemWrappers = {
|
||||
// Key System wrappers map messages and pass to a handler, then map the response and return to caller
|
||||
//
|
||||
// function wrapper(handler, messageType, message, params)
|
||||
//
|
||||
// where:
|
||||
// Promise<response> handler(messageType, message, responseType, headers, params);
|
||||
//
|
||||
|
||||
'com.widevine.alpha': function(handler, messageType, message, params) {
|
||||
return handler.call(this, messageType, new Uint8Array(message), 'json', null, params).then(function(response){
|
||||
return base64DecodeToUnit8Array(response.license);
|
||||
});
|
||||
},
|
||||
|
||||
'com.microsoft.playready': function(handler, messageType, message, params) {
|
||||
var msg, xmlDoc;
|
||||
var licenseRequest = null;
|
||||
var headers = {};
|
||||
var parser = new DOMParser();
|
||||
var dataview = new Uint16Array(message);
|
||||
|
||||
msg = String.fromCharCode.apply(null, dataview);
|
||||
xmlDoc = parser.parseFromString(msg, 'application/xml');
|
||||
|
||||
if (xmlDoc.getElementsByTagName('Challenge')[0]) {
|
||||
var challenge = xmlDoc.getElementsByTagName('Challenge')[0].childNodes[0].nodeValue;
|
||||
if (challenge) {
|
||||
licenseRequest = atob(challenge);
|
||||
}
|
||||
}
|
||||
|
||||
var headerNameList = xmlDoc.getElementsByTagName('name');
|
||||
var headerValueList = xmlDoc.getElementsByTagName('value');
|
||||
for (var i = 0; i < headerNameList.length; i++) {
|
||||
headers[headerNameList[i].childNodes[0].nodeValue] = headerValueList[i].childNodes[0].nodeValue;
|
||||
}
|
||||
// some versions of the PlayReady CDM return 'Content' instead of 'Content-Type',
|
||||
// but the license server expects 'Content-Type', so we fix it up here.
|
||||
if (headers.hasOwnProperty('Content')) {
|
||||
headers['Content-Type'] = headers.Content;
|
||||
delete headers.Content;
|
||||
}
|
||||
|
||||
return handler.call(this, messageType, licenseRequest, 'arraybuffer', headers, params).catch(function(response){
|
||||
return response.text().then( function( error ) { throw error; } );
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const requestConstructors = {
|
||||
// Server request construction functions
|
||||
//
|
||||
// Promise<request> constructRequest(config, sessionType, content, messageType, message, params)
|
||||
//
|
||||
// request = { url: ..., headers: ..., body: ... }
|
||||
//
|
||||
// content = { assetId: ..., variantId: ..., key: ... }
|
||||
// params = { expiration: ... }
|
||||
|
||||
'drmtoday': function(config, sessionType, content, messageType, message, headers, params) {
|
||||
var optData = JSON.stringify({merchant: config.merchant, userId:"12345", sessionId:""});
|
||||
var crt = {};
|
||||
if (messageType === 'license-request') {
|
||||
crt = {assetId: content.assetId,
|
||||
outputProtection: {digital : false, analogue: false, enforce: false},
|
||||
storeLicense: (sessionType === 'persistent-license')};
|
||||
|
||||
if (!params || params.expiration === undefined) {
|
||||
crt.profile = {purchase: {}};
|
||||
} else {
|
||||
crt.profile = {rental: {absoluteExpiration: (new Date(params.expiration)).toISOString(),
|
||||
playDuration: 3600000 } };
|
||||
}
|
||||
|
||||
if (content.variantId !== undefined) {
|
||||
crt.variantId = content.variantId;
|
||||
}
|
||||
}
|
||||
|
||||
return JWT.encode("HS256", {optData: optData, crt: JSON.stringify([crt])}, config.secret).then(function(jwt){
|
||||
headers = headers || {};
|
||||
headers['x-dt-auth-token'] = jwt;
|
||||
return {url: config.serverURL, headers: headers, body: message};
|
||||
});
|
||||
},
|
||||
|
||||
'microsoft': function(config, sessionType, content, messageType, message, headers, params) {
|
||||
var url = config.serverURL;
|
||||
if (messageType === 'license-request') {
|
||||
url += "?";
|
||||
if (sessionType === 'temporary' || sessionType === 'persistent-usage-record') {
|
||||
url += "UseSimpleNonPersistentLicense=1&";
|
||||
}
|
||||
if (sessionType === 'persistent-usage-record') {
|
||||
url += "SecureStop=1&";
|
||||
}
|
||||
url += "PlayEnablers=B621D91F-EDCC-4035-8D4B-DC71760D43E9&"; // disable output protection
|
||||
url += "ContentKey=" + btoa(String.fromCharCode.apply(null, content.key));
|
||||
return url;
|
||||
}
|
||||
|
||||
// TODO: Include expiration time in URL
|
||||
return Promise.resolve({url: url, headers: headers, body: message});
|
||||
}
|
||||
};
|
||||
|
||||
MessageHandler = function(keysystem, content, sessionType) {
|
||||
sessionType = sessionType || "temporary";
|
||||
|
||||
this._keysystem = keysystem;
|
||||
this._content = content;
|
||||
this._sessionType = sessionType;
|
||||
this._drmconfig = drmconfig[ this._keysystem ].filter( function( drmconfig ) {
|
||||
return drmconfig.sessionTypes === undefined || ( drmconfig.sessionTypes.indexOf( sessionType ) !== -1 );
|
||||
} )[ 0 ];
|
||||
try {
|
||||
this._drmconfig = drmconfig[this._keysystem].filter(function(drmconfig) {
|
||||
return drmconfig.sessionTypes === undefined || (drmconfig.sessionTypes.indexOf(sessionType) !== -1);
|
||||
})[0];
|
||||
this._requestConstructor = requestConstructors[this._drmconfig.servertype];
|
||||
|
||||
this.messagehandler = MessageHandler.prototype.messagehandler.bind( this );
|
||||
if ( this._drmconfig && this._drmconfig.certificate ) {
|
||||
this.servercertificate = stringToUint8Array( atob( this._drmconfig.certificate ) );
|
||||
this.messagehandler = keySystemWrappers[keysystem].bind(this, MessageHandler.prototype.messagehandler);
|
||||
|
||||
if (this._drmconfig && this._drmconfig.certificate) {
|
||||
this.servercertificate = stringToUint8Array(atob(this._drmconfig.certificate));
|
||||
}
|
||||
} catch(e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
MessageHandler.prototype.messagehandler = function messagehandler( messageType, message) {
|
||||
MessageHandler.prototype.messagehandler = function messagehandler(messageType, message, responseType, headers, params) {
|
||||
|
||||
// For the DRM Today server, mapping between Key System messages and server protocol messages depends on
|
||||
// the Key System, so we provide key-system-specific functions here to perform the mapping.
|
||||
//
|
||||
// For the Microsoft server, the mapping for PlayReady is the same as for the DRM Today server
|
||||
//
|
||||
const keySystems = {
|
||||
'com.widevine.alpha': {
|
||||
responseType: 'json',
|
||||
getLicenseMessage: function(response) {
|
||||
return base64DecodeToUnit8Array( response.license );
|
||||
},
|
||||
getErrorResponse: function(response) {
|
||||
return response;
|
||||
},
|
||||
getLicenseRequestFromMessage: function(message) {
|
||||
return new Uint8Array(message);
|
||||
},
|
||||
getRequestHeadersFromMessage: function(/*message*/) {
|
||||
return null;
|
||||
var variantId = params ? params.variantId : undefined;
|
||||
var key;
|
||||
if( variantId ) {
|
||||
var keys = this._content.keys.filter(function(k){return k.variantId === variantId;});
|
||||
if (keys[0]) key = keys[0].key;
|
||||
}
|
||||
if (!key) {
|
||||
key = this._content.keys[0].key;
|
||||
}
|
||||
|
||||
var content = {assetId: this._content.assetId,
|
||||
variantId: variantId,
|
||||
key: key};
|
||||
|
||||
return this._requestConstructor(this._drmconfig, this._sessionType, content, messageType, message, headers, params).then(function(request){
|
||||
return fetch(request.url, {
|
||||
method: 'POST',
|
||||
headers: request.headers,
|
||||
body: request.body });
|
||||
}).then(function(fetchresponse){
|
||||
if(fetchresponse.status !== 200) {
|
||||
throw fetchresponse;
|
||||
}
|
||||
|
||||
if(responseType === 'json') {
|
||||
return fetchresponse.json();
|
||||
} else if(responseType === 'arraybuffer') {
|
||||
return fetchresponse.arrayBuffer();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
})();
|
||||
|
||||
(function() {
|
||||
|
||||
var subtlecrypto = window.crypto.subtle;
|
||||
|
||||
// Encoding / decoding utilities
|
||||
function b64pad(b64) { return b64+"==".substr(0,(b64.length%4)?(4-b64.length%4):0); }
|
||||
function str2b64url(str) { return btoa(str).replace(/=+$/g, '').replace(/\+/g, "-").replace(/\//g, "_"); }
|
||||
function b64url2str(b64) { return atob(b64pad(b64.replace(/\-/g, "+").replace(/\_/g, "/"))); }
|
||||
function str2ab(str) { return Uint8Array.from( str.split(''), function(s){return s.charCodeAt(0)} ); }
|
||||
function ab2str(ab) { return String.fromCharCode.apply(null, new Uint8Array(ab)); }
|
||||
|
||||
function jwt2webcrypto(alg) {
|
||||
if (alg === "HS256") return {name: "HMAC", hash: "SHA-256", length: 256};
|
||||
else if (alg === "HS384") return { name: "HMAC", hash: "SHA-384", length: 384};
|
||||
else if (alg === "HS512") return { name: "HMAC", hash: "SHA-512", length: 512};
|
||||
else throw new Error("Unrecognized JWT algorithm: " + alg);
|
||||
}
|
||||
|
||||
JWT = {
|
||||
encode: function encode(alg, claims, secret) {
|
||||
var algorithm = jwt2webcrypto(alg);
|
||||
if (secret.byteLength !== algorithm.length / 8) throw new Error("Unexpected secret length: " + secret.byteLength);
|
||||
|
||||
if (!claims.iat) claims.iat = ((Date.now() / 1000) | 0) - 60;
|
||||
if (!claims.jti) {
|
||||
var nonce = new Uint8Array(16);
|
||||
window.crypto.getRandomValues(nonce);
|
||||
claims.jti = str2b64url( ab2str(nonce) );
|
||||
}
|
||||
|
||||
var header = {typ: "JWT", alg: alg};
|
||||
var plaintext = str2b64url(JSON.stringify(header)) + '.' + str2b64url(JSON.stringify(claims));
|
||||
return subtlecrypto.importKey("raw", secret, algorithm, false, [ "sign" ]).then( function(key) {
|
||||
return subtlecrypto.sign(algorithm, key, str2ab(plaintext));
|
||||
}).then(function(hmac){
|
||||
return plaintext + '.' + str2b64url(ab2str(hmac));
|
||||
});
|
||||
},
|
||||
'com.microsoft.playready': {
|
||||
responseType: 'arraybuffer',
|
||||
getLicenseMessage: function(response) {
|
||||
return response;
|
||||
},
|
||||
getErrorResponse: function(response) {
|
||||
return String.fromCharCode.apply(null, new Uint16Array(response));
|
||||
},
|
||||
getLicenseRequestFromMessage: function(message) {
|
||||
var msg,
|
||||
xmlDoc;
|
||||
var licenseRequest = null;
|
||||
var parser = new DOMParser();
|
||||
var dataview = new Uint16Array(message);
|
||||
|
||||
msg = String.fromCharCode.apply(null, dataview);
|
||||
decode: function decode(jwt, secret) {
|
||||
var jwtparts = jwt.split('.');
|
||||
var header = JSON.parse( b64url2str(jwtparts[0]));
|
||||
var claims = JSON.parse( b64url2str(jwtparts[1]));
|
||||
var hmac = str2ab(b64url2str(jwtparts[2]));
|
||||
var algorithm = jwt2webcrypto(header.alg);
|
||||
if (secret.byteLength !== algorithm.length / 8) throw new Error("Unexpected secret length: " + secret.byteLength);
|
||||
|
||||
xmlDoc = parser.parseFromString(msg, 'application/xml');
|
||||
|
||||
if (xmlDoc.getElementsByTagName('Challenge')[0]) {
|
||||
var Challenge = xmlDoc.getElementsByTagName('Challenge')[0].childNodes[0].nodeValue;
|
||||
if (Challenge) {
|
||||
licenseRequest = atob(Challenge);
|
||||
}
|
||||
}
|
||||
return licenseRequest;
|
||||
},
|
||||
getRequestHeadersFromMessage: function(message) {
|
||||
var msg,
|
||||
xmlDoc;
|
||||
var headers = {};
|
||||
var parser = new DOMParser();
|
||||
var dataview = new Uint16Array(message);
|
||||
|
||||
msg = String.fromCharCode.apply(null, dataview);
|
||||
xmlDoc = parser.parseFromString(msg, 'application/xml');
|
||||
|
||||
var headerNameList = xmlDoc.getElementsByTagName('name');
|
||||
var headerValueList = xmlDoc.getElementsByTagName('value');
|
||||
for (var i = 0; i < headerNameList.length; i++) {
|
||||
headers[headerNameList[i].childNodes[0].nodeValue] = headerValueList[i].childNodes[0].nodeValue;
|
||||
}
|
||||
// some versions of the PlayReady CDM return 'Content' instead of 'Content-Type',
|
||||
// but the license server expects 'Content-Type', so we fix it up here.
|
||||
if (headers.hasOwnProperty('Content')) {
|
||||
headers['Content-Type'] = headers.Content;
|
||||
delete headers.Content;
|
||||
}
|
||||
return headers;
|
||||
}
|
||||
return subtlecrypto.importKey("raw", secret, algorithm, false, ["sign", "verify"]).then(function(key) {
|
||||
return subtlecrypto.verify(algorithm, key, hmac, str2ab(jwtparts[0] + '.' + jwtparts[1]));
|
||||
}).then(function(success){
|
||||
if (!success) throw new Error("Invalid signature");
|
||||
return claims;
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// License request parameters are communicated to the DRM Today and Microsoft servers in different ways,
|
||||
// using a custom HTTP headers (DRM Today) and URL parameters (Microsoft).
|
||||
const serverTypes = {
|
||||
'drmtoday': {
|
||||
constructLicenseRequestUrl : function( serverURL, sessionType, messageType, content ) {
|
||||
return serverURL;
|
||||
},
|
||||
getCustomHeaders : function( drmconfig, sessionType, messageType ) {
|
||||
var customHeader = { merchant: drmconfig.merchant,
|
||||
userId: "purchase",
|
||||
sessionId: "a0d0f0p" + ( ( sessionType === 'persistent-license' ) ? "1" : "0" ) };
|
||||
return { "dt-custom-data" : btoa( JSON.stringify( customHeader ) ) };
|
||||
}
|
||||
},
|
||||
'microsoft': {
|
||||
constructLicenseRequestUrl : function( serverURL, sessionType, messageType, content ) {
|
||||
if ( messageType !== 'license-request' ) {
|
||||
return serverURL;
|
||||
}
|
||||
|
||||
var url = serverURL + "?";
|
||||
if ( sessionType === 'temporary' || sessionType === 'persistent-usage-record' ) {
|
||||
url += "UseSimpleNonPersistentLicense=1&";
|
||||
}
|
||||
if ( sessionType === 'persistent-usage-record' ) {
|
||||
url += "SecureStop=1&";
|
||||
}
|
||||
url += "PlayEnablers=B621D91F-EDCC-4035-8D4B-DC71760D43E9&"; // disable output protection
|
||||
url += "ContentKey=" + btoa(String.fromCharCode.apply(null, content.keys[0].key));
|
||||
return url;
|
||||
},
|
||||
getCustomHeaders : function() { return {}; }
|
||||
}
|
||||
};
|
||||
|
||||
return new Promise(function(resolve, reject) {
|
||||
var keysystemfns = keySystems[this._keysystem],
|
||||
serverfns,
|
||||
url = undefined,
|
||||
requestheaders = {},
|
||||
credentials = undefined;
|
||||
|
||||
if ( !this._drmconfig || !keysystemfns || !this._drmconfig.servertype || !serverTypes[this._drmconfig.servertype] ) {
|
||||
reject('Unsupported Key System');
|
||||
return;
|
||||
}
|
||||
|
||||
serverfns = serverTypes[this._drmconfig.servertype];
|
||||
|
||||
if ( !this._drmconfig.serverURL ) {
|
||||
reject('Undefined serverURL');
|
||||
return;
|
||||
}
|
||||
|
||||
url = serverfns.constructLicenseRequestUrl( this._drmconfig.serverURL, this._sessionType, messageType, this._content );
|
||||
|
||||
// Ensure valid license server URL
|
||||
if (!url) {
|
||||
reject('No license server URL specified!');
|
||||
return;
|
||||
}
|
||||
|
||||
// Set optional XMLHttpRequest headers from protection data and message
|
||||
var updateHeaders = function(headers) {
|
||||
var key;
|
||||
if (headers) {
|
||||
for (key in headers) {
|
||||
if ('authorization' === key.toLowerCase()) {
|
||||
credentials = 'include';
|
||||
}
|
||||
requestheaders[key] = headers[key];
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
updateHeaders(serverfns.getCustomHeaders( this._drmconfig, this._sessionType, messageType ) );
|
||||
updateHeaders(keysystemfns.getRequestHeadersFromMessage(message));
|
||||
|
||||
// Set withCredentials property from server
|
||||
if ( this._drmconfig.withCredentials ) {
|
||||
credentials = 'include';
|
||||
}
|
||||
|
||||
fetch(url, {
|
||||
method: 'POST',
|
||||
headers: requestheaders,
|
||||
credentials: credentials,
|
||||
body: keysystemfns.getLicenseRequestFromMessage(message)
|
||||
}).then(function(fetchresponse) {
|
||||
if(fetchresponse.status !== 200) {
|
||||
reject( this._keysystem + ' update, XHR status is "' + fetchresponse.statusText
|
||||
+ '" (' + fetchresponse.status + '), expected to be 200. readyState is ' + fetchresponse.readyState + '.'
|
||||
+ ' Response is ' + ((fetchresponse) ? keysystemfns.getErrorResponse(fetchresponse) : 'NONE' ));
|
||||
return;
|
||||
}
|
||||
|
||||
if(keysystemfns.responseType === 'json') {
|
||||
return fetchresponse.json();
|
||||
} else if(keysystemfns.responseType === 'arraybuffer') {
|
||||
return fetchresponse.arrayBuffer();
|
||||
}
|
||||
}.bind( this )).then(function(response){
|
||||
resolve(keysystemfns.getLicenseMessage(response));
|
||||
}).catch(reject);
|
||||
}.bind( this ));
|
||||
};
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -15,29 +15,35 @@ function testmediasource(config) {
|
|||
|
||||
// Create media source
|
||||
var source = new MediaSource();
|
||||
source.done = new Promise(function(resolvesource,rejectsource){
|
||||
|
||||
// Create and fill source buffers when the media source is opened
|
||||
source.addEventListener('sourceopen', onSourceOpen);
|
||||
// Create and fill source buffers when the media source is opened
|
||||
source.addEventListener('sourceopen', onSourceOpen);
|
||||
resolve(source);
|
||||
|
||||
function onSourceOpen(event) {
|
||||
var audioSourceBuffer = source.addSourceBuffer(config.audioType),
|
||||
videoSourceBuffer = source.addSourceBuffer(config.videoType);
|
||||
function onSourceOpen(event) {
|
||||
var audioSourceBuffer = source.addSourceBuffer(config.audioType),
|
||||
videoSourceBuffer = source.addSourceBuffer(config.videoType);
|
||||
|
||||
audioSourceBuffer.appendBuffer(config.audioMedia);
|
||||
videoSourceBuffer.appendBuffer(config.videoMedia);
|
||||
audioSourceBuffer.addEventListener('updateend',onUpdateEnd);
|
||||
videoSourceBuffer.addEventListener('updateend',onUpdateEnd);
|
||||
|
||||
function endOfStream() {
|
||||
if (audioSourceBuffer.updating || videoSourceBuffer.updating) {
|
||||
setTimeout(endOfStream, 250);
|
||||
} else {
|
||||
source.endOfStream();
|
||||
audioSourceBuffer.appendBuffer(config.audioMedia);
|
||||
videoSourceBuffer.appendBuffer(config.videoMedia);
|
||||
|
||||
function onUpdateEnd(event){
|
||||
event.target.removeEventListener('updateend', onUpdateEnd);
|
||||
if (!audioSourceBuffer.updating && !videoSourceBuffer.updating) {
|
||||
if (source.readyState !== 'open') {
|
||||
rejectsource(new Error("Media source error"));
|
||||
} else {
|
||||
source.endOfStream();
|
||||
resolvesource();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
endOfStream();
|
||||
}
|
||||
|
||||
resolve(source);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,6 +96,12 @@ function waitForEventAndRunStep(eventName, element, func, stepTest)
|
|||
element.addEventListener(eventName, stepTest.step_func(eventCallback), true);
|
||||
}
|
||||
|
||||
function waitForEvent(eventName, element) {
|
||||
return new Promise(function(resolve) {
|
||||
element.addEventListener(eventName, resolve, true);
|
||||
})
|
||||
}
|
||||
|
||||
var consoleDiv = null;
|
||||
|
||||
function consoleWrite(text)
|
||||
|
|
@ -112,16 +118,7 @@ function consoleWrite(text)
|
|||
|
||||
function forceTestFailureFromPromise(test, error, message)
|
||||
{
|
||||
// Promises convert exceptions into rejected Promises. Since there is
|
||||
// currently no way to report a failed test in the test harness, errors
|
||||
// are reported using force_timeout().
|
||||
if (message)
|
||||
consoleWrite(message + ': ' + error.message);
|
||||
else if (error)
|
||||
consoleWrite(error);
|
||||
|
||||
test.force_timeout();
|
||||
test.done();
|
||||
test.step_func(assert_unreached)(message ? message + ': ' + error.message : error);
|
||||
}
|
||||
|
||||
// Returns an array of audioCapabilities that includes entries for a set of
|
||||
|
|
@ -178,26 +175,34 @@ function arrayBufferAsString(buffer)
|
|||
|
||||
function dumpKeyStatuses(keyStatuses)
|
||||
{
|
||||
consoleWrite("for (var entry of keyStatuses)");
|
||||
for (var entry of keyStatuses) {
|
||||
consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
|
||||
var userAgent = navigator.userAgent.toLowerCase();
|
||||
if (userAgent.indexOf('edge') === -1) {
|
||||
consoleWrite("for (var entry of keyStatuses)");
|
||||
for (var entry of keyStatuses) {
|
||||
consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
|
||||
}
|
||||
consoleWrite("for (var keyId of keyStatuses.keys())");
|
||||
for (var keyId of keyStatuses.keys()) {
|
||||
consoleWrite(arrayBufferAsString(keyId));
|
||||
}
|
||||
consoleWrite("for (var status of keyStatuses.values())");
|
||||
for (var status of keyStatuses.values()) {
|
||||
consoleWrite(status);
|
||||
}
|
||||
consoleWrite("for (var entry of keyStatuses.entries())");
|
||||
for (var entry of keyStatuses.entries()) {
|
||||
consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
|
||||
}
|
||||
consoleWrite("keyStatuses.forEach()");
|
||||
keyStatuses.forEach(function(status, keyId) {
|
||||
consoleWrite(arrayBufferAsString(keyId) + ": " + status);
|
||||
});
|
||||
} else {
|
||||
consoleWrite("keyStatuses.forEach()");
|
||||
keyStatuses.forEach(function(keyId, status) {
|
||||
consoleWrite(arrayBufferAsString(keyId) + ": " + status);
|
||||
});
|
||||
}
|
||||
consoleWrite("for (var keyId of keyStatuses.keys())");
|
||||
for (var keyId of keyStatuses.keys()) {
|
||||
consoleWrite(arrayBufferAsString(keyId));
|
||||
}
|
||||
consoleWrite("for (var status of keyStatuses.values())");
|
||||
for (var status of keyStatuses.values()) {
|
||||
consoleWrite(status);
|
||||
}
|
||||
consoleWrite("for (var entry of keyStatuses.entries())");
|
||||
for (var entry of keyStatuses.entries()) {
|
||||
consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
|
||||
}
|
||||
consoleWrite("keyStatuses.forEach()");
|
||||
keyStatuses.forEach(function(status, keyId) {
|
||||
consoleWrite(arrayBufferAsString(keyId) + ": " + status);
|
||||
});
|
||||
}
|
||||
|
||||
// Verify that |keyStatuses| contains just the keys in |keys.expected|
|
||||
|
|
@ -225,4 +230,56 @@ function verifyKeyStatuses(keyStatuses, keys)
|
|||
});
|
||||
}
|
||||
|
||||
// This function checks that calling |testCase.func| returns a
|
||||
// rejected Promise with the error.name equal to
|
||||
// |testCase.exception|.
|
||||
function test_exception(testCase /*...*/) {
|
||||
var func = testCase.func;
|
||||
var exception = testCase.exception;
|
||||
var args = Array.prototype.slice.call(arguments, 1);
|
||||
|
||||
// Currently blink throws for TypeErrors rather than returning
|
||||
// a rejected promise (http://crbug.com/359386).
|
||||
// FIXME: Remove try/catch once they become failed promises.
|
||||
try {
|
||||
return func.apply(null, args).then(
|
||||
function (result) {
|
||||
assert_unreached(format_value(func));
|
||||
},
|
||||
function (error) {
|
||||
assert_equals(error.name, exception, format_value(func));
|
||||
assert_not_equals(error.message, "", format_value(func));
|
||||
}
|
||||
);
|
||||
} catch (e) {
|
||||
// Only allow 'TypeError' exceptions to be thrown.
|
||||
// Everything else should be a failed promise.
|
||||
assert_equals('TypeError', exception, format_value(func));
|
||||
assert_equals(e.name, exception, format_value(func));
|
||||
}
|
||||
}
|
||||
|
||||
// Check that the events sequence (array of strings) matches the pattern (array of either strings, or
|
||||
// arrays of strings, with the latter representing a possibly repeating sub-sequence)
|
||||
function checkEventSequence(events,pattern) {
|
||||
function th(i) { return i + (i < 4 ? ["th", "st", "nd", "rd"][i] : "th"); }
|
||||
var i = 0, j=0, k=0;
|
||||
while(i < events.length && j < pattern.length) {
|
||||
if (!Array.isArray(pattern[j])) {
|
||||
assert_equals(events[i], pattern[j], "Expected " + th(i+1) + " event to be '" + pattern[j] + "'");
|
||||
++i;
|
||||
++j;
|
||||
} else {
|
||||
assert_equals(events[i], pattern[j][k], "Expected " + th(i+1) + " event to be '" + pattern[j][k] + "'");
|
||||
++i;
|
||||
k = (k+1)%pattern[j].length;
|
||||
if (k === 0 && events[i] !== pattern[j][0]) {
|
||||
++j;
|
||||
}
|
||||
}
|
||||
}
|
||||
assert_equals(i,events.length,"Received more events than expected");
|
||||
assert_equals(j,pattern.length,"Expected more events than received");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue