Update web-platform-tests to revision 6087baf4a83e7953112242be9fd6e719797ebdf6

This commit is contained in:
WPT Sync Bot 2018-12-07 20:30:51 -05:00
parent 3c19cd49ec
commit 6c2d26eb4b
76 changed files with 3020 additions and 345 deletions

View file

@ -5,7 +5,7 @@
'use strict';
(function() {
var mojomId = 'content/test/data/mojo_layouttest_test.mojom';
var mojomId = 'content/test/data/mojo_web_test_helper_test.mojom';
if (mojo.internal.isMojomLoaded(mojomId)) {
console.warn('The following mojom is loaded multiple times: ' + mojomId);
return;
@ -23,23 +23,23 @@
function MojoLayoutTestHelper_Reverse_Params(values) {
function MojoWebTestHelper_Reverse_Params(values) {
this.initDefaults_();
this.initFields_(values);
}
MojoLayoutTestHelper_Reverse_Params.prototype.initDefaults_ = function() {
MojoWebTestHelper_Reverse_Params.prototype.initDefaults_ = function() {
this.message = null;
};
MojoLayoutTestHelper_Reverse_Params.prototype.initFields_ = function(fields) {
MojoWebTestHelper_Reverse_Params.prototype.initFields_ = function(fields) {
for(var field in fields) {
if (this.hasOwnProperty(field))
this[field] = fields[field];
}
};
MojoLayoutTestHelper_Reverse_Params.validate = function(messageValidator, offset) {
MojoWebTestHelper_Reverse_Params.validate = function(messageValidator, offset) {
var err;
err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
if (err !== validator.validationError.NONE)
@ -53,7 +53,7 @@
return err;
// validate MojoLayoutTestHelper_Reverse_Params.message
// validate MojoWebTestHelper_Reverse_Params.message
err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
if (err !== validator.validationError.NONE)
return err;
@ -61,40 +61,40 @@
return validator.validationError.NONE;
};
MojoLayoutTestHelper_Reverse_Params.encodedSize = codec.kStructHeaderSize + 8;
MojoWebTestHelper_Reverse_Params.encodedSize = codec.kStructHeaderSize + 8;
MojoLayoutTestHelper_Reverse_Params.decode = function(decoder) {
MojoWebTestHelper_Reverse_Params.decode = function(decoder) {
var packed;
var val = new MojoLayoutTestHelper_Reverse_Params();
var val = new MojoWebTestHelper_Reverse_Params();
var numberOfBytes = decoder.readUint32();
var version = decoder.readUint32();
val.message = decoder.decodeStruct(codec.String);
return val;
};
MojoLayoutTestHelper_Reverse_Params.encode = function(encoder, val) {
MojoWebTestHelper_Reverse_Params.encode = function(encoder, val) {
var packed;
encoder.writeUint32(MojoLayoutTestHelper_Reverse_Params.encodedSize);
encoder.writeUint32(MojoWebTestHelper_Reverse_Params.encodedSize);
encoder.writeUint32(0);
encoder.encodeStruct(codec.String, val.message);
};
function MojoLayoutTestHelper_Reverse_ResponseParams(values) {
function MojoWebTestHelper_Reverse_ResponseParams(values) {
this.initDefaults_();
this.initFields_(values);
}
MojoLayoutTestHelper_Reverse_ResponseParams.prototype.initDefaults_ = function() {
MojoWebTestHelper_Reverse_ResponseParams.prototype.initDefaults_ = function() {
this.reversed = null;
};
MojoLayoutTestHelper_Reverse_ResponseParams.prototype.initFields_ = function(fields) {
MojoWebTestHelper_Reverse_ResponseParams.prototype.initFields_ = function(fields) {
for(var field in fields) {
if (this.hasOwnProperty(field))
this[field] = fields[field];
}
};
MojoLayoutTestHelper_Reverse_ResponseParams.validate = function(messageValidator, offset) {
MojoWebTestHelper_Reverse_ResponseParams.validate = function(messageValidator, offset) {
var err;
err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
if (err !== validator.validationError.NONE)
@ -108,7 +108,7 @@
return err;
// validate MojoLayoutTestHelper_Reverse_ResponseParams.reversed
// validate MojoWebTestHelper_Reverse_ResponseParams.reversed
err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
if (err !== validator.validationError.NONE)
return err;
@ -116,62 +116,62 @@
return validator.validationError.NONE;
};
MojoLayoutTestHelper_Reverse_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
MojoWebTestHelper_Reverse_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
MojoLayoutTestHelper_Reverse_ResponseParams.decode = function(decoder) {
MojoWebTestHelper_Reverse_ResponseParams.decode = function(decoder) {
var packed;
var val = new MojoLayoutTestHelper_Reverse_ResponseParams();
var val = new MojoWebTestHelper_Reverse_ResponseParams();
var numberOfBytes = decoder.readUint32();
var version = decoder.readUint32();
val.reversed = decoder.decodeStruct(codec.String);
return val;
};
MojoLayoutTestHelper_Reverse_ResponseParams.encode = function(encoder, val) {
MojoWebTestHelper_Reverse_ResponseParams.encode = function(encoder, val) {
var packed;
encoder.writeUint32(MojoLayoutTestHelper_Reverse_ResponseParams.encodedSize);
encoder.writeUint32(MojoWebTestHelper_Reverse_ResponseParams.encodedSize);
encoder.writeUint32(0);
encoder.encodeStruct(codec.String, val.reversed);
};
var kMojoLayoutTestHelper_Reverse_Name = 0;
var kMojoWebTestHelper_Reverse_Name = 0;
function MojoLayoutTestHelperPtr(handleOrPtrInfo) {
this.ptr = new bindings.InterfacePtrController(MojoLayoutTestHelper,
function MojoWebTestHelperPtr(handleOrPtrInfo) {
this.ptr = new bindings.InterfacePtrController(MojoWebTestHelper,
handleOrPtrInfo);
}
function MojoLayoutTestHelperAssociatedPtr(associatedInterfacePtrInfo) {
function MojoWebTestHelperAssociatedPtr(associatedInterfacePtrInfo) {
this.ptr = new associatedBindings.AssociatedInterfacePtrController(
MojoLayoutTestHelper, associatedInterfacePtrInfo);
MojoWebTestHelper, associatedInterfacePtrInfo);
}
MojoLayoutTestHelperAssociatedPtr.prototype =
Object.create(MojoLayoutTestHelperPtr.prototype);
MojoLayoutTestHelperAssociatedPtr.prototype.constructor =
MojoLayoutTestHelperAssociatedPtr;
MojoWebTestHelperAssociatedPtr.prototype =
Object.create(MojoWebTestHelperPtr.prototype);
MojoWebTestHelperAssociatedPtr.prototype.constructor =
MojoWebTestHelperAssociatedPtr;
function MojoLayoutTestHelperProxy(receiver) {
function MojoWebTestHelperProxy(receiver) {
this.receiver_ = receiver;
}
MojoLayoutTestHelperPtr.prototype.reverse = function() {
return MojoLayoutTestHelperProxy.prototype.reverse
MojoWebTestHelperPtr.prototype.reverse = function() {
return MojoWebTestHelperProxy.prototype.reverse
.apply(this.ptr.getProxy(), arguments);
};
MojoLayoutTestHelperProxy.prototype.reverse = function(message) {
var params = new MojoLayoutTestHelper_Reverse_Params();
MojoWebTestHelperProxy.prototype.reverse = function(message) {
var params = new MojoWebTestHelper_Reverse_Params();
params.message = message;
return new Promise(function(resolve, reject) {
var builder = new codec.MessageV1Builder(
kMojoLayoutTestHelper_Reverse_Name,
codec.align(MojoLayoutTestHelper_Reverse_Params.encodedSize),
kMojoWebTestHelper_Reverse_Name,
codec.align(MojoWebTestHelper_Reverse_Params.encodedSize),
codec.kMessageExpectsResponse, 0);
builder.encodeStruct(MojoLayoutTestHelper_Reverse_Params, params);
builder.encodeStruct(MojoWebTestHelper_Reverse_Params, params);
var message = builder.finish();
this.receiver_.acceptAndExpectResponse(message).then(function(message) {
var reader = new codec.MessageReader(message);
var responseParams =
reader.decodeStruct(MojoLayoutTestHelper_Reverse_ResponseParams);
reader.decodeStruct(MojoWebTestHelper_Reverse_ResponseParams);
resolve(responseParams);
}).catch(function(result) {
reject(Error("Connection error: " + result));
@ -179,14 +179,14 @@
}.bind(this));
};
function MojoLayoutTestHelperStub(delegate) {
function MojoWebTestHelperStub(delegate) {
this.delegate_ = delegate;
}
MojoLayoutTestHelperStub.prototype.reverse = function(message) {
MojoWebTestHelperStub.prototype.reverse = function(message) {
return this.delegate_ && this.delegate_.reverse && this.delegate_.reverse(message);
}
MojoLayoutTestHelperStub.prototype.accept = function(message) {
MojoWebTestHelperStub.prototype.accept = function(message) {
var reader = new codec.MessageReader(message);
switch (reader.messageName) {
default:
@ -194,21 +194,21 @@
}
};
MojoLayoutTestHelperStub.prototype.acceptWithResponder =
MojoWebTestHelperStub.prototype.acceptWithResponder =
function(message, responder) {
var reader = new codec.MessageReader(message);
switch (reader.messageName) {
case kMojoLayoutTestHelper_Reverse_Name:
var params = reader.decodeStruct(MojoLayoutTestHelper_Reverse_Params);
case kMojoWebTestHelper_Reverse_Name:
var params = reader.decodeStruct(MojoWebTestHelper_Reverse_Params);
this.reverse(params.message).then(function(response) {
var responseParams =
new MojoLayoutTestHelper_Reverse_ResponseParams();
new MojoWebTestHelper_Reverse_ResponseParams();
responseParams.reversed = response.reversed;
var builder = new codec.MessageV1Builder(
kMojoLayoutTestHelper_Reverse_Name,
codec.align(MojoLayoutTestHelper_Reverse_ResponseParams.encodedSize),
kMojoWebTestHelper_Reverse_Name,
codec.align(MojoWebTestHelper_Reverse_ResponseParams.encodedSize),
codec.kMessageIsResponse, reader.requestID);
builder.encodeStruct(MojoLayoutTestHelper_Reverse_ResponseParams,
builder.encodeStruct(MojoWebTestHelper_Reverse_ResponseParams,
responseParams);
var message = builder.finish();
responder.accept(message);
@ -219,13 +219,13 @@
}
};
function validateMojoLayoutTestHelperRequest(messageValidator) {
function validateMojoWebTestHelperRequest(messageValidator) {
var message = messageValidator.message;
var paramsClass = null;
switch (message.getName()) {
case kMojoLayoutTestHelper_Reverse_Name:
case kMojoWebTestHelper_Reverse_Name:
if (message.expectsResponse())
paramsClass = MojoLayoutTestHelper_Reverse_Params;
paramsClass = MojoWebTestHelper_Reverse_Params;
break;
}
if (paramsClass === null)
@ -233,13 +233,13 @@
return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
}
function validateMojoLayoutTestHelperResponse(messageValidator) {
function validateMojoWebTestHelperResponse(messageValidator) {
var message = messageValidator.message;
var paramsClass = null;
switch (message.getName()) {
case kMojoLayoutTestHelper_Reverse_Name:
case kMojoWebTestHelper_Reverse_Name:
if (message.isResponse())
paramsClass = MojoLayoutTestHelper_Reverse_ResponseParams;
paramsClass = MojoWebTestHelper_Reverse_ResponseParams;
break;
}
if (paramsClass === null)
@ -247,18 +247,18 @@
return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
}
var MojoLayoutTestHelper = {
name: 'content.mojom.MojoLayoutTestHelper',
var MojoWebTestHelper = {
name: 'content.mojom.MojoWebTestHelper',
kVersion: 0,
ptrClass: MojoLayoutTestHelperPtr,
proxyClass: MojoLayoutTestHelperProxy,
stubClass: MojoLayoutTestHelperStub,
validateRequest: validateMojoLayoutTestHelperRequest,
validateResponse: validateMojoLayoutTestHelperResponse,
ptrClass: MojoWebTestHelperPtr,
proxyClass: MojoWebTestHelperProxy,
stubClass: MojoWebTestHelperStub,
validateRequest: validateMojoWebTestHelperRequest,
validateResponse: validateMojoWebTestHelperResponse,
};
MojoLayoutTestHelperStub.prototype.validator = validateMojoLayoutTestHelperRequest;
MojoLayoutTestHelperProxy.prototype.validator = validateMojoLayoutTestHelperResponse;
exports.MojoLayoutTestHelper = MojoLayoutTestHelper;
exports.MojoLayoutTestHelperPtr = MojoLayoutTestHelperPtr;
exports.MojoLayoutTestHelperAssociatedPtr = MojoLayoutTestHelperAssociatedPtr;
MojoWebTestHelperStub.prototype.validator = validateMojoWebTestHelperRequest;
MojoWebTestHelperProxy.prototype.validator = validateMojoWebTestHelperResponse;
exports.MojoWebTestHelper = MojoWebTestHelper;
exports.MojoWebTestHelperPtr = MojoWebTestHelperPtr;
exports.MojoWebTestHelperAssociatedPtr = MojoWebTestHelperAssociatedPtr;
})();

View file

@ -190,10 +190,7 @@
async_test("test should timeout (fail) with the default of 2 seconds").step(function(){});
async_test("test should timeout (fail) with a custom set timeout value of 1 second",
{timeout:1000}).step(function(){});
async_test("async test that is never started, should have status Not Run", {timeout:1000});
async_test("async test that is never started, should have status Not Run");
test(function(t) {
@ -344,9 +341,7 @@
"status_string": "NOTRUN",
"name": "async test that is never started, should have status Not Run",
"message": null,
"properties": {
"timeout": 1000
}
"properties": {}
},
{
"status_string": "PASS",
@ -402,14 +397,6 @@
"message": null,
"properties": {}
},
{
"status_string": "TIMEOUT",
"name": "test should timeout (fail) with a custom set timeout value of 1 second",
"message": "Test timed out",
"properties": {
"timeout": 1000
}
},
{
"status_string": "TIMEOUT",
"name": "test should timeout (fail) with the default of 2 seconds",

View file

@ -1486,11 +1486,9 @@ policies and contribution forms [3].
this.index = null;
this.properties = properties;
var timeout = properties.timeout ? properties.timeout : settings.test_timeout;
if (timeout !== null) {
this.timeout_length = timeout * tests.timeout_multiplier;
} else {
this.timeout_length = null;
this.timeout_length = settings.test_timeout;
if (this.timeout_length !== null) {
this.timeout_length *= tests.timeout_multiplier;
}
this.message = null;