Skip to content

fix: assertFailure catch exception throw by assert (#703) #704

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

Merged
mgechev merged 1 commit into from
Aug 24, 2018
Merged

fix: assertFailure catch exception throw by assert (#703) #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 10 additions & 22 deletions test/testHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ const parseInvalidSource = (source: string, message: string, specialChar = '~',
*
* @param config
*/
export function assertAnnotated(config: AssertConfig) {
export function assertAnnotated(config: AssertConfig): RuleFailure[] | void {
const { message, options, ruleName, source: sourceConfig } = config;

if (message) {
Expand Down Expand Up @@ -230,25 +230,18 @@ export function assertFailure(
fail: IExpectedFailure,
options?: any,
onlyNthFailure = 0
): RuleFailure[] | undefined {
let result: LintResult;

try {
result = lint(ruleName, source, options);
): RuleFailure[] {
const result = lint(ruleName, source, options);

assert(result.failures && result.failures.length > 0, 'no failures');
assert(result.failures && result.failures.length > 0, 'no failures');

const ruleFail = result.failures[onlyNthFailure];
const ruleFail = result.failures[onlyNthFailure];

assert.equal(fail.message, ruleFail.getFailure(), "error messages don't match");
assert.deepEqual(fail.startPosition, ruleFail.getStartPosition().getLineAndCharacter(), "start char doesn't match");
assert.deepEqual(fail.endPosition, ruleFail.getEndPosition().getLineAndCharacter(), "end char doesn't match");
assert.equal(fail.message, ruleFail.getFailure(), "error messages don't match");
assert.deepEqual(fail.startPosition, ruleFail.getStartPosition().getLineAndCharacter(), "start char doesn't match");
assert.deepEqual(fail.endPosition, ruleFail.getEndPosition().getLineAndCharacter(), "end char doesn't match");

return result ? result.failures : undefined;
} catch (e) {
console.log(e.stack);
return undefined;
}
return result.failures;
}

/**
Expand All @@ -261,12 +254,7 @@ export function assertFailure(
* @param options
*/
export function assertFailures(ruleName: string, source: string | SourceFile, fails: IExpectedFailure[], options?: any) {
let result;
try {
result = lint(ruleName, source, options);
} catch (e) {
console.log(e.stack);
}
const result = lint(ruleName, source, options);

assert(result.failures && result.failures.length > 0, 'no failures');
result.failures.forEach((ruleFail, index) => {
Expand Down