Skip to content

Use 'TokenKind' enum inside lexer/parser tests #1640

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
Jan 2, 2019
Merged

Use 'TokenKind' enum inside lexer/parser tests #1640

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
33 changes: 17 additions & 16 deletions src/language/__tests__/lexer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,8 +704,8 @@ describe('Lexer', () => {
});

it('lex reports useful information for dashes in names', () => {
const q = 'a-b';
const lexer = createLexer(new Source(q));
const source = new Source('a-b');
const lexer = createLexer(source);
const firstToken = lexer.advance();
expect(firstToken).to.contain({
kind: TokenKind.NAME,
Expand All @@ -723,21 +723,22 @@ describe('Lexer', () => {
});

it('produces double linked list of tokens, including comments', () => {
const lexer = createLexer(
new Source(`{
#comment
field
}`),
);
const source = new Source(`
{
#comment
field
}
`);

const lexer = createLexer(source);
const startToken = lexer.token;
let endToken;
do {
endToken = lexer.advance();
// Lexer advances over ignored comment tokens to make writing parsers
// easier, but will include them in the linked list result.
expect(endToken.kind).not.to.equal('Comment');
} while (endToken.kind !== '<EOF>');
expect(endToken.kind).not.to.equal(TokenKind.COMMENT);
} while (endToken.kind !== TokenKind.EOF);

expect(startToken.prev).to.equal(null);
expect(endToken.next).to.equal(null);
Expand All @@ -752,12 +753,12 @@ describe('Lexer', () => {
}

expect(tokens.map(tok => tok.kind)).to.deep.equal([
'<SOF>',
'{',
'Comment',
'Name',
'}',
'<EOF>',
TokenKind.SOF,
TokenKind.BRACE_L,
TokenKind.COMMENT,
TokenKind.NAME,
TokenKind.BRACE_R,
TokenKind.EOF,
]);
});
});
8 changes: 6 additions & 2 deletions src/language/__tests__/parser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { join } from 'path';
import { Kind } from '../kinds';
import { expect } from 'chai';
import { describe, it } from 'mocha';
import { TokenKind } from '../lexer';
import { parse, parseValue, parseType } from '../parser';
import { Source } from '../source';
import dedent from '../../jsutils/dedent';
Expand Down Expand Up @@ -403,8 +404,11 @@ describe('Parser', () => {
it('contains references to start and end tokens', () => {
const result = parse('{ id }');

expect(result).to.have.nested.property('loc.startToken.kind', '<SOF>');
expect(result).to.have.nested.property('loc.endToken.kind', '<EOF>');
expect(result).to.have.nested.property(
'loc.startToken.kind',
TokenKind.SOF,
);
expect(result).to.have.nested.property('loc.endToken.kind', TokenKind.EOF);
});

describe('parseValue', () => {
Expand Down