Skip to content

Fix failure to validate exception messages #379

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
merged 1 commit into from
Nov 30, 2018
Merged

Fix failure to validate exception messages #379

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions test/tool/TestParseTreeMatcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ export class TestParseTreeMatcher {

@Test public testInvertedTags(): void {
let m: ParseTreePatternMatcher = this.getPatternMatcher(ParseTreeMatcherX1Lexer, ParseTreeMatcherX1Parser);
assert.throws(() => m.split(">expr<"), "tag delimiters out of order in pattern: >expr<");
assert.throws(() => m.split(">expr<"), /^Error: tag delimiters out of order in pattern: >expr<$/);
}

@Test public testUnclosedTag(): void {
let m: ParseTreePatternMatcher = this.getPatternMatcher(ParseTreeMatcherX1Lexer, ParseTreeMatcherX1Parser);
assert.throws(() => m.split("<expr hi mom"), "unterminated tag in pattern: <expr hi mom");
assert.throws(() => m.split("<expr hi mom"), /^Error: unterminated tag in pattern: <expr hi mom$/);
}

@Test public testExtraClose(): void {
let m: ParseTreePatternMatcher = this.getPatternMatcher(ParseTreeMatcherX1Lexer, ParseTreeMatcherX1Parser);
assert.throws(() => m.split("<expr> >"), "missing start tag in pattern: <expr> >");
assert.throws(() => m.split("<expr> >"), /^Error: missing start tag in pattern: <expr> >$/);
}

@Test public testTokenizingPattern(): void {
Expand Down
14 changes: 7 additions & 7 deletions test/tool/TestXPath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,48 +87,48 @@ export class TestXPath {

@Test public testWeirdChar(): void {
let path: string = "&";
let expected: string = "Invalid tokens or characters at index 0 in path '&'";
let expected: RegExp = /^RangeError: Invalid tokens or characters at index 0 in path '&' -- $/;

this.testError(SAMPLE_PROGRAM, path, expected, (parser) => parser.prog(), TestXPathLexer, TestXPathParser);
}

@Test public testWeirdChar2(): void {
let path: string = "//w&e/";
let expected: string = "Invalid tokens or characters at index 3 in path '//w&e/'";
let expected: RegExp = /^RangeError: Invalid tokens or characters at index 3 in path '\/\/w&e\/' -- $/;

this.testError(SAMPLE_PROGRAM, path, expected, (parser) => parser.prog(), TestXPathLexer, TestXPathParser);
}

@Test public testBadSyntax(): void {
let path: string = "///";
let expected: string = "/ at index 2 isn't a valid rule name";
let expected: RegExp = /^Error: \/ at index 2 isn't a valid rule name$/;

this.testError(SAMPLE_PROGRAM, path, expected, (parser) => parser.prog(), TestXPathLexer, TestXPathParser);
}

@Test public testMissingWordAtEnd(): void {
let path: string = "//";
let expected: string = "Missing path element at end of path";
let expected: RegExp = /^Error: Missing path element at end of path$/;

this.testError(SAMPLE_PROGRAM, path, expected, (parser) => parser.prog(), TestXPathLexer, TestXPathParser);
}

@Test public testBadTokenName(): void {
let path: string = "//Ick";
let expected: string = "Ick at index 2 isn't a valid token name";
let expected: RegExp = /^Error: Ick at index 2 isn't a valid token name$/;

this.testError(SAMPLE_PROGRAM, path, expected, (parser) => parser.prog(), TestXPathLexer, TestXPathParser);
}

@Test public testBadRuleName(): void {
let path: string = "/prog/ick";
let expected: string = "ick at index 6 isn't a valid rule name";
let expected: RegExp = /^Error: ick at index 6 isn't a valid rule name$/;

this.testError(SAMPLE_PROGRAM, path, expected, (parser) => parser.prog(), TestXPathLexer, TestXPathParser);
}

protected testError<TParser extends Parser>(
input: string, path: string, expected: string,
input: string, path: string, expected: RegExp,
startRule: (parser: TParser) => ParseTree,
lexerCtor: {new(stream: CharStream): Lexer},
parserCtor: {new(stream: TokenStream): TParser}): void {
Expand Down