Skip to content

Commit 0bac287

Browse files
somebluemgechev
authored andcommittedAug 24, 2018
fix: assertFailure catch exception throw by assert (#703) (#704)
1 parent 7f0fe0e commit 0bac287

File tree

1 file changed

+10
-22
lines changed

1 file changed

+10
-22
lines changed
 

‎test/testHelper.ts

+10-22
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const parseInvalidSource = (source: string, message: string, specialChar = '~',
163163
*
164164
* @param config
165165
*/
166-
export function assertAnnotated(config: AssertConfig) {
166+
export function assertAnnotated(config: AssertConfig): RuleFailure[] | void {
167167
const { message, options, ruleName, source: sourceConfig } = config;
168168

169169
if (message) {
@@ -230,25 +230,18 @@ export function assertFailure(
230230
fail: IExpectedFailure,
231231
options?: any,
232232
onlyNthFailure = 0
233-
): RuleFailure[] | undefined {
234-
let result: LintResult;
235-
236-
try {
237-
result = lint(ruleName, source, options);
233+
): RuleFailure[] {
234+
const result = lint(ruleName, source, options);
238235

239-
assert(result.failures && result.failures.length > 0, 'no failures');
236+
assert(result.failures && result.failures.length > 0, 'no failures');
240237

241-
const ruleFail = result.failures[onlyNthFailure];
238+
const ruleFail = result.failures[onlyNthFailure];
242239

243-
assert.equal(fail.message, ruleFail.getFailure(), "error messages don't match");
244-
assert.deepEqual(fail.startPosition, ruleFail.getStartPosition().getLineAndCharacter(), "start char doesn't match");
245-
assert.deepEqual(fail.endPosition, ruleFail.getEndPosition().getLineAndCharacter(), "end char doesn't match");
240+
assert.equal(fail.message, ruleFail.getFailure(), "error messages don't match");
241+
assert.deepEqual(fail.startPosition, ruleFail.getStartPosition().getLineAndCharacter(), "start char doesn't match");
242+
assert.deepEqual(fail.endPosition, ruleFail.getEndPosition().getLineAndCharacter(), "end char doesn't match");
246243

247-
return result ? result.failures : undefined;
248-
} catch (e) {
249-
console.log(e.stack);
250-
return undefined;
251-
}
244+
return result.failures;
252245
}
253246

254247
/**
@@ -261,12 +254,7 @@ export function assertFailure(
261254
* @param options
262255
*/
263256
export function assertFailures(ruleName: string, source: string | SourceFile, fails: IExpectedFailure[], options?: any) {
264-
let result;
265-
try {
266-
result = lint(ruleName, source, options);
267-
} catch (e) {
268-
console.log(e.stack);
269-
}
257+
const result = lint(ruleName, source, options);
270258

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

0 commit comments

Comments
 (0)
Please sign in to comment.