Skip to content

Commit 24fc5ea

Browse files
committed
Adapt test cases to the change
1 parent 3c7a970 commit 24fc5ea

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

Tests/SwiftParserTest/DeclarationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ final class DeclarationTests: XCTestCase {
917917
diagnostics: [
918918
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
919919
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ')' to end parameter clause"),
920-
DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code ': Int) {}' at top level"),
920+
DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code ': Int)' in function"),
921921
]
922922
)
923923
}

Tests/SwiftParserTest/translated/EffectfulPropertiesTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ final class EffectfulPropertiesTests: XCTestCase {
231231
}
232232
""",
233233
diagnostics: [
234-
DiagnosticSpec(message: "unexpected code 'bogus {}' in variable")
234+
DiagnosticSpec(message: "unexpected code 'bogus' in accessor")
235235
]
236236
)
237237
}
@@ -257,7 +257,7 @@ final class EffectfulPropertiesTests: XCTestCase {
257257
}
258258
""",
259259
diagnostics: [
260-
DiagnosticSpec(message: "unexpected code '-> Int { 0 }' in variable")
260+
DiagnosticSpec(message: "unexpected code '-> Int' in accessor")
261261
]
262262
)
263263
}

Tests/SwiftParserTest/translated/InvalidTests.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ final class InvalidTests: XCTestCase {
205205
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ')' in function type"),
206206
DiagnosticSpec(locationMarker: "3️⃣", message: "expected return type in function type"),
207207
DiagnosticSpec(locationMarker: "3️⃣", message: "expected ')' to end parameter clause"),
208-
DiagnosticSpec(locationMarker: "4️⃣", message: "extraneous code ') {}' at top level"),
208+
DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code '<T>()' in function signature"),
209+
DiagnosticSpec(locationMarker: "4️⃣", message: "unexpected code ')' in function")
209210
]
210211
)
211212
}
@@ -484,6 +485,7 @@ final class InvalidTests: XCTestCase {
484485
diagnostics: [
485486
DiagnosticSpec(locationMarker: "1️⃣", message: "expected '(' to start parameter clause"),
486487
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ')' to end parameter clause"),
488+
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '()' in function")
487489
]
488490
)
489491
}
@@ -497,6 +499,7 @@ final class InvalidTests: XCTestCase {
497499
diagnostics: [
498500
DiagnosticSpec(locationMarker: "1️⃣", message: "expected '(' to start parameter clause"),
499501
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ')' to end parameter clause"),
502+
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '(x: T)' in function")
500503
]
501504
)
502505
}

Tests/SwiftParserTest/translated/RecoveryTests.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,13 +1206,14 @@ final class RecoveryTests: XCTestCase {
12061206
func bar() -> Int3️⃣] {
12071207
return [0]
12081208
}
1209-
}
1209+
4️⃣}
12101210
""",
12111211
diagnostics: [
12121212
DiagnosticSpec(locationMarker: "1️⃣", message: "expected '}' to end struct"),
12131213
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ']' to end array"),
12141214
// TODO: Old parser expected error on line 5: unexpected ']' in type; did you mean to write an array type?, Fix-It replacements: 17 - 17 = '['
1215-
DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code at top level"),
1215+
DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code ']' in function"),
1216+
DiagnosticSpec(locationMarker: "4️⃣", message: "extraneous brace at top level"),
12161217
]
12171218
)
12181219
}
@@ -1247,7 +1248,7 @@ final class RecoveryTests: XCTestCase {
12471248
""",
12481249
diagnostics: [
12491250
// TODO: Old parser expected error on line 2: array types are now written with the brackets around the element type, Fix-It replacements: 17 - 17 = '[', 20 - 21 = ''
1250-
DiagnosticSpec(message: "unexpected code in struct")
1251+
DiagnosticSpec(message: "unexpected code '[0]' in function")
12511252
]
12521253
)
12531254
}
@@ -1263,7 +1264,7 @@ final class RecoveryTests: XCTestCase {
12631264
""",
12641265
diagnostics: [
12651266
// TODO: Old parser expected error on line 2: array types are now written with the brackets around the element type, Fix-It replacements: 17 - 17 = '[', 20 - 21 = ''
1266-
DiagnosticSpec(message: "unexpected code in struct")
1267+
DiagnosticSpec(message: "unexpected code '[0_1]' in function")
12671268
]
12681269
)
12691270
}
@@ -1279,7 +1280,7 @@ final class RecoveryTests: XCTestCase {
12791280
""",
12801281
diagnostics: [
12811282
// TODO: Old parser expected error on line 2: array types are now written with the brackets around the element type, Fix-It replacements: 17 - 17 = '[', 20 - 21 = ''
1282-
DiagnosticSpec(message: "unexpected code in struct")
1283+
DiagnosticSpec(message: "unexpected code '[0b1]' in function")
12831284
]
12841285
)
12851286
}

0 commit comments

Comments
 (0)