Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Report the expected error indicated by the "negative" frontmatter when it isn't thrown #47

Merged
merged 2 commits into from
Sep 24, 2015
Merged

Report the expected error indicated by the "negative" frontmatter when it isn't thrown #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b91134
Drop support for the "negative" flag
Sep 24, 2015
038cc9c
Report the expected error indicated by the "negative" frontmatter whe…
Sep 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions lib/runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ var errorLogRe = /^test262\/error (.*)$/;
// errorStack: stack trace of error thrown (used for debugging purposes)
Runner.prototype.validateResult = function(test, result) {
var expectingStack = false;
var isNegative = test.attrs.flags.negative || test.attrs.negative;
var negative = test.attrs.negative;
// parse result from log
(result.log || []).forEach(function(log) {
var errorMatch = log.match(errorLogRe);
Expand Down Expand Up @@ -203,17 +203,13 @@ Runner.prototype.validateResult = function(test, result) {
test.errorMessage = result.errorMessage;
test.errorStack = result.errorStack;

if(isNegative) {
if(test.attrs.negative) {
// failure can either match against error name, or an exact match
// against error message (the latter case is thus far only to support
// NotEarlyError thrown errors which have an error type of "Error").
test.pass =
!!result.errorName.match(new RegExp(test.attrs.negative)) ||
result.errorMessage === test.attrs.negative;
} else {
test.pass = true
}
if(negative) {
// failure can either match against error name, or an exact match
// against error message (the latter case is thus far only to support
// NotEarlyError thrown errors which have an error type of "Error").
test.pass =
!!result.errorName.match(new RegExp(negative)) ||
result.errorMessage === negative;
} else {
test.pass = false
}
Expand All @@ -223,8 +219,10 @@ Runner.prototype.validateResult = function(test, result) {
test.pass = false;
test.errorName = "Test262 Error";
test.errorMessage = "Test did not run to completion ($DONE not called)";
} else if(isNegative) {
} else if(negative) {
test.pass = false;
test.errorName = "Error Expected";
test.errorMessage = "'" + negative + "' is expected, but was not thrown";
} else {
test.pass = true;
}
Expand Down
4 changes: 4 additions & 0 deletions test/collateral/negativeMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/*---
description: Should report the expected error indicated by the "negative" frontmatter
negative: ExpectedError
---*/
2 changes: 2 additions & 0 deletions test/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ var all = [
{ file: 'test/collateral/error.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Test262Error' },
{ file: 'test/collateral/thrownError.js', strictMode: false, pass: false, errorMessage: 'failure message', errorName: 'Error', topOfStack: "foo" },
{ file: 'test/collateral/thrownError.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Error', topOfStack: "foo" },
{ file: 'test/collateral/negativeMessage.js', strictMode: false, pass: false, errorMessage: "'ExpectedError' is expected, but was not thrown", errorName: 'Error Expected'},
{ file: 'test/collateral/negativeMessage.js', strictMode: true, pass: false, errorMessage: "'ExpectedError' is expected, but was not thrown", errorName: 'Error Expected'},
]

var seen = {};
Expand Down