Skip to content

Commit 3ddf8e9

Browse files
committed
fix lexer tests
1 parent ac052ae commit 3ddf8e9

File tree

3 files changed

+130
-18
lines changed

3 files changed

+130
-18
lines changed

partiql-parser/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ serde = { version = "1", features = ["derive"], optional = true }
4848
[dev-dependencies]
4949
criterion = "0.5"
5050
assert_matches = "1"
51+
insta = "1"
5152

5253
[features]
5354
default = []

partiql-parser/src/lexer/mod.rs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,8 @@ mod tests {
101101
let lexer = PartiqlLexer::new(s, &mut offset_tracker);
102102
let toks: Vec<_> = lexer.collect::<Result<_, _>>().unwrap();
103103

104-
#[rustfmt::skip]
105-
let expected = vec![
106-
"(", "WITH", "[", "WHERE", "{", "VALUE", "}", "USING", "]", "UNPIVOT", ")", "UNION",
107-
"<<", "TRUE", ">>", "SELECT", ";", "RIGHT", ",", "PRESERVE", "<", "PIVOT", ">", "OUTER",
108-
"<=", "ORDER", ">=", "OR", "!=", "ON", "<>", "OFFSET", "=", "NULLS", "==", "NULL", "-",
109-
"NOT", "+", "NATURAL", "*", "MISSING", "?", "LIMIT", "%", "LIKE", "/", "LEFT", "^",
110-
"LATERAL", ".", "LAST", "||", "JOIN", ":", "INTERSECT", "--", "IS", "/**/", "INNER",
111-
"<unquoted_ident:UNQUOTED_IDENT>", "IN", "<quoted_ident:QUOTED_IDENT>", "HAVING",
112-
"<unquoted_atident:UNQUOTED_ATIDENT>", "GROUP", "<quoted_atident:QUOTED_ATIDENT>",
113-
"FROM", "FOR", "FULL", "FIRST", "FALSE", "EXCEPT", "ESCAPE", "DESC", "CROSS", "TABLE",
114-
"TIME", "TIMESTAMP", "DATE", "BY", "BETWEEN", "AT", "AS", "AND", "ASC", "ALL", "VALUES",
115-
"CASE", "WHEN", "THEN", "ELSE", "END", "MATCH", "ANY", "SHORTEST", "TRAIL", "ACYCLIC", "SIMPLE"
116-
];
117-
let displayed = toks
118-
.into_iter()
119-
.map(|(_s, t, _e)| t.to_string())
120-
.collect::<Vec<_>>();
121-
assert_eq!(expected, displayed);
104+
let toks = toks.into_iter().map(|(_s, t, _e)| t).collect::<Vec<_>>();
105+
insta::assert_debug_snapshot!(toks);
122106

123107
Ok(())
124108
}
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
---
2+
source: partiql-parser/src/lexer/mod.rs
3+
expression: toks
4+
---
5+
[
6+
OpenParen,
7+
With,
8+
OpenSquare,
9+
Where,
10+
OpenCurly,
11+
Value,
12+
CloseCurly,
13+
Using,
14+
CloseSquare,
15+
Unpivot,
16+
CloseParen,
17+
Union,
18+
OpenDblAngle,
19+
True,
20+
CloseDblAngle,
21+
Select,
22+
Semicolon,
23+
Right,
24+
Comma,
25+
Preserve,
26+
LessThan,
27+
Pivot,
28+
GreaterThan,
29+
Outer,
30+
LessEqual,
31+
Order,
32+
GreaterEqual,
33+
Or,
34+
BangEqual,
35+
On,
36+
LessGreater,
37+
Offset,
38+
Equal,
39+
Nulls,
40+
EqualEqual,
41+
Null,
42+
Minus,
43+
Not,
44+
Plus,
45+
Natural,
46+
Star,
47+
Missing,
48+
QuestionMark,
49+
Limit,
50+
Percent,
51+
Like,
52+
Slash,
53+
Left,
54+
Caret,
55+
Lateral,
56+
Period,
57+
Last,
58+
DblPipe,
59+
Join,
60+
Colon,
61+
Intersect,
62+
CommentLine(
63+
"--foo",
64+
),
65+
Is,
66+
CommentBlock(
67+
"/*block*/",
68+
),
69+
Inner,
70+
UnquotedIdent(
71+
"unquoted_ident",
72+
),
73+
In,
74+
QuotedIdent(
75+
"quoted_ident",
76+
),
77+
Having,
78+
UnquotedAtIdentifier(
79+
"unquoted_atident",
80+
),
81+
Group,
82+
QuotedAtIdentifier(
83+
"quoted_atident",
84+
),
85+
From,
86+
For,
87+
Full,
88+
First,
89+
False,
90+
Except,
91+
Escape,
92+
Desc,
93+
Cross,
94+
Table,
95+
Time,
96+
Timestamp,
97+
Date,
98+
By,
99+
Between,
100+
At,
101+
As,
102+
And,
103+
Asc,
104+
All,
105+
Values,
106+
Case,
107+
When,
108+
Then,
109+
Else,
110+
End,
111+
Match,
112+
Any(
113+
"Any",
114+
),
115+
Shortest(
116+
"Shortest",
117+
),
118+
Trail(
119+
"Trail",
120+
),
121+
Acyclic(
122+
"Acyclic",
123+
),
124+
Simple(
125+
"Simple",
126+
),
127+
]

0 commit comments

Comments
 (0)