Skip to content

Commit 6056c29

Browse files
nateboschnatebosch
authored
Update test expectations for source_span output (flutter#77)
Version `1.5.0` of `source_span` changed the output format. Update the tests which hardcoded the expected output to the new format.
1 parent e782c92 commit 6056c29

File tree

3 files changed

+92
-46
lines changed

3 files changed

+92
-46
lines changed

‎test/error_test.dart‎

Lines changed: 56 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ void testUnsupportedFontWeights() {
2323
expect(errors.isEmpty, false);
2424
expect(errors[0].toString(), r'''
2525
error on line 1, column 24: Unknown property value bolder
26-
.foobar { font-weight: bolder; }
27-
^^^^^^''');
26+
╷
27+
1 │ .foobar { font-weight: bolder; }
28+
│ ^^^^^^
29+
╵''');
2830
expect(stylesheet != null, true);
2931

3032
expect(prettyPrint(stylesheet), r'''
@@ -40,8 +42,10 @@ error on line 1, column 24: Unknown property value bolder
4042
expect(errors.isEmpty, false);
4143
expect(errors[0].toString(), r'''
4244
error on line 1, column 24: Unknown property value lighter
43-
.foobar { font-weight: lighter; }
44-
^^^^^^^''');
45+
╷
46+
1 │ .foobar { font-weight: lighter; }
47+
│ ^^^^^^^
48+
╵''');
4549
expect(stylesheet != null, true);
4650
expect(prettyPrint(stylesheet), r'''
4751
.foobar {
@@ -56,8 +60,10 @@ error on line 1, column 24: Unknown property value lighter
5660
expect(errors.isEmpty, false);
5761
expect(errors[0].toString(), r'''
5862
error on line 1, column 24: Unknown property value inherit
59-
.foobar { font-weight: inherit; }
60-
^^^^^^^''');
63+
╷
64+
1 │ .foobar { font-weight: inherit; }
65+
│ ^^^^^^^
66+
╵''');
6167
expect(stylesheet != null, true);
6268
expect(prettyPrint(stylesheet), r'''
6369
.foobar {
@@ -79,8 +85,10 @@ void testUnsupportedLineHeights() {
7985
expect(errors.isEmpty, false);
8086
expect(errors[0].toString(), r'''
8187
error on line 1, column 24: Unexpected value for line-height
82-
.foobar { line-height: 120%; }
83-
^^^''');
88+
╷
89+
1 │ .foobar { line-height: 120%; }
90+
│ ^^^
91+
╵''');
8492
expect(stylesheet != null, true);
8593
expect(prettyPrint(stylesheet), r'''
8694
.foobar {
@@ -95,8 +103,10 @@ error on line 1, column 24: Unexpected value for line-height
95103
expect(errors.isEmpty, false);
96104
expect(errors[0].toString(), r'''
97105
error on line 1, column 24: Unexpected unit for line-height
98-
.foobar { line-height: 20cm; }
99-
^^''');
106+
╷
107+
1 │ .foobar { line-height: 20cm; }
108+
│ ^^
109+
╵''');
100110
expect(stylesheet != null, true);
101111
expect(prettyPrint(stylesheet), r'''
102112
.foobar {
@@ -111,8 +121,10 @@ error on line 1, column 24: Unexpected unit for line-height
111121
expect(errors.isEmpty, false);
112122
expect(errors[0].toString(), r'''
113123
error on line 1, column 24: Unknown property value inherit
114-
.foobar { line-height: inherit; }
115-
^^^^^^^''');
124+
╷
125+
1 │ .foobar { line-height: inherit; }
126+
│ ^^^^^^^
127+
╵''');
116128
expect(stylesheet != null, true);
117129
expect(prettyPrint(stylesheet), r'''
118130
.foobar {
@@ -131,8 +143,10 @@ void testBadSelectors() {
131143
expect(errors.isEmpty, false);
132144
expect(errors[0].toString(), r'''
133145
error on line 1, column 1: Not a valid ID selector expected #id
134-
# foo { color: #ff00ff; }
135-
^''');
146+
╷
147+
1 │ # foo { color: #ff00ff; }
148+
│ ^
149+
╵''');
136150
expect(stylesheet != null, true);
137151
expect(prettyPrint(stylesheet), r'''
138152
# foo {
@@ -146,8 +160,10 @@ error on line 1, column 1: Not a valid ID selector expected #id
146160
expect(errors.isEmpty, false);
147161
expect(errors[0].toString(), r'''
148162
error on line 1, column 1: Not a valid class selector expected .className
149-
. foo { color: #ff00ff; }
150-
^''');
163+
╷
164+
1 │ . foo { color: #ff00ff; }
165+
│ ^
166+
╵''');
151167
expect(stylesheet != null, true);
152168
expect(prettyPrint(stylesheet), r'''
153169
. foo {
@@ -166,8 +182,10 @@ void testBadHexValues() {
166182
expect(errors.isEmpty, false);
167183
expect(errors[0].toString(), r'''
168184
error on line 1, column 18: Bad hex number
169-
.foobar { color: #AH787; }
170-
^^^^^^''');
185+
╷
186+
1 │ .foobar { color: #AH787; }
187+
│ ^^^^^^
188+
╵''');
171189
expect(stylesheet != null, true);
172190
expect(prettyPrint(stylesheet), r'''
173191
.foobar {
@@ -181,8 +199,10 @@ error on line 1, column 18: Bad hex number
181199
expect(errors.isEmpty, false);
182200
expect(errors[0].toString(), r'''
183201
error on line 1, column 18: Unknown property value redder
184-
.foobar { color: redder; }
185-
^^^^^^''');
202+
╷
203+
1 │ .foobar { color: redder; }
204+
│ ^^^^^^
205+
╵''');
186206

187207
expect(stylesheet != null, true);
188208
expect(prettyPrint(stylesheet), r'''
@@ -197,8 +217,10 @@ error on line 1, column 18: Unknown property value redder
197217
expect(errors.isEmpty, false);
198218
expect(errors[0].toString(), r'''
199219
error on line 1, column 18: Expected hex number
200-
.foobar { color: # ffffff; }
201-
^''');
220+
╷
221+
1 │ .foobar { color: # ffffff; }
222+
│ ^
223+
╵''');
202224

203225
expect(stylesheet != null, true);
204226
expect(prettyPrint(stylesheet), r'''
@@ -213,8 +235,10 @@ error on line 1, column 18: Expected hex number
213235
expect(errors.isEmpty, false);
214236
expect(errors[0].toString(), r'''
215237
error on line 1, column 18: Expected hex number
216-
.foobar { color: # 123fff; }
217-
^''');
238+
╷
239+
1 │ .foobar { color: # 123fff; }
240+
│ ^
241+
╵''');
218242

219243
expect(stylesheet != null, true);
220244

@@ -241,8 +265,10 @@ void testBadUnicode() {
241265
errors[0].toString(),
242266
'error on line 3, column 20: unicode first range can not be greater than '
243267
'last\n'
244-
' unicode-range: U+400-200;\n'
245-
' ^^^^^^^');
268+
' ╷\n'
269+
'3 │ unicode-range: U+400-200;\n'
270+
' │ ^^^^^^^\n'
271+
' ╵');
246272

247273
final String input2 = '''
248274
@font-face {
@@ -256,8 +282,10 @@ void testBadUnicode() {
256282
expect(
257283
errors[0].toString(),
258284
'error on line 3, column 20: unicode range must be less than 10FFFF\n'
259-
' unicode-range: U+12FFFF;\n'
260-
' ^^^^^^');
285+
' ╷\n'
286+
'3 │ unicode-range: U+12FFFF;\n'
287+
' │ ^^^^^^\n'
288+
' ╵');
261289
}
262290

263291
void testBadNesting() {

‎test/selector_test.dart‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,19 @@ void testSelectorFailures() {
8080
errors[0].toString(),
8181
'error on line 1, column 9: name must start with a alpha character, but '
8282
'found a number\n'
83-
'.foobar .1a-story .xyzzy\n'
84-
' ^^');
83+
' ╷\n'
84+
'1 │ .foobar .1a-story .xyzzy\n'
85+
' │ ^^\n'
86+
' ╵');
8587

8688
selector(':host()', errors: errors..clear());
8789
expect(
8890
errors.first.toString(),
8991
'error on line 1, column 7: expected a selector argument, but found )\n'
90-
':host()\n'
91-
' ^');
92+
' ╷\n'
93+
'1 │ :host()\n'
94+
' │ ^\n'
95+
' ╵');
9296
}
9397

9498
main() {

‎test/var_test.dart‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -401,26 +401,40 @@ void undefinedVars() {
401401

402402
var errorStrings = [
403403
'error on line 5, column 14: Variable is not defined.\n'
404-
' var-a: var(b);\n'
405-
' ^^',
404+
' ╷\n'
405+
'5 │ var-a: var(b);\n'
406+
' │ ^^\n'
407+
' ╵',
406408
'error on line 6, column 14: Variable is not defined.\n'
407-
' var-b: var(c);\n'
408-
' ^^',
409+
' ╷\n'
410+
'6 │ var-b: var(c);\n'
411+
' │ ^^\n'
412+
' ╵',
409413
'error on line 9, column 16: Variable is not defined.\n'
410-
' var-one: var(two);\n'
411-
' ^^^^',
414+
' ╷\n'
415+
'9 │ var-one: var(two);\n'
416+
' │ ^^^^\n'
417+
' ╵',
412418
'error on line 12, column 17: Variable is not defined.\n'
413-
' var-four: var(five);\n'
414-
' ^^^^^',
419+
' ╷\n'
420+
'12 │ var-four: var(five);\n'
421+
' │ ^^^^^\n'
422+
' ╵',
415423
'error on line 13, column 17: Variable is not defined.\n'
416-
' var-five: var(six);\n'
417-
' ^^^^',
424+
' ╷\n'
425+
'13 │ var-five: var(six);\n'
426+
' │ ^^^^\n'
427+
' ╵',
418428
'error on line 16, column 18: Variable is not defined.\n'
419-
' var-def-1: var(def-2);\n'
420-
' ^^^^^^',
429+
' ╷\n'
430+
'16 │ var-def-1: var(def-2);\n'
431+
' │ ^^^^^^\n'
432+
' ╵',
421433
'error on line 17, column 18: Variable is not defined.\n'
422-
' var-def-2: var(def-3);\n'
423-
' ^^^^^^',
434+
' ╷\n'
435+
'17 │ var-def-2: var(def-3);\n'
436+
' │ ^^^^^^\n'
437+
' ╵',
424438
];
425439

426440
var generated = r'''

0 commit comments

Comments
 (0)