Skip to content

Commit 4b71a1b

Browse files
d-biehld-biehl
committed
correct tests for goto and find references
1 parent 2309c50 commit 4b71a1b

File tree

38 files changed

+333
-324
lines changed

38 files changed

+333
-324
lines changed

‎tests/robotcode/language_server/robotframework/parts/test_document_highlight.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,9 @@ async def test(
3333
result = await protocol.robot_document_highlight.collect(
3434
protocol.robot_document_highlight, test_document, Position(line=data.line, character=data.character)
3535
)
36-
data_regression.check({"data": data, "result": result})
36+
data_regression.check(
37+
{
38+
"data": data,
39+
"result": sorted(result, key=lambda v: (v.range.start, v.range.end, v.kind)) if result else result,
40+
}
41+
)

‎tests/robotcode/language_server/robotframework/parts/test_references.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ async def test(
3535
test_document: TextDocument,
3636
data: GeneratedTestData,
3737
) -> None:
38-
def split(location: Optional[Location]) -> Optional[Location]:
39-
if location is None:
40-
return None
41-
38+
def split(location: Location) -> Location:
4239
return Location("/".join(location.uri.split("/")[-2:]), location.range)
4340

4441
result = await protocol.robot_references.collect(
@@ -47,4 +44,11 @@ def split(location: Optional[Location]) -> Optional[Location]:
4744
Position(line=data.line, character=data.character),
4845
ReferenceContext(include_declaration=True),
4946
)
50-
data_regression.check({"data": data, "result": [split(v) for v in result] if result else result})
47+
data_regression.check(
48+
{
49+
"data": data,
50+
"result": sorted((split(v) for v in result), key=lambda v: (v.uri, v.range.start, v.range.end))
51+
if result
52+
else result,
53+
}
54+
)

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_013_036_Variable_in_library_params_.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ result:
66
- !Location
77
range:
88
end:
9-
character: 10
10-
line: 24
9+
character: 46
10+
line: 13
1111
start:
12-
character: 0
13-
line: 24
12+
character: 36
13+
line: 13
1414
uri: data/references.robot
1515
- !Location
1616
range:
1717
end:
18-
character: 46
19-
line: 13
18+
character: 10
19+
line: 24
2020
start:
21-
character: 36
22-
line: 13
21+
character: 0
22+
line: 24
2323
uri: data/references.robot
2424
- !Location
2525
range:

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_013_041_Variable_in_library_params_.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ result:
66
- !Location
77
range:
88
end:
9-
character: 10
10-
line: 24
9+
character: 46
10+
line: 13
1111
start:
12-
character: 0
13-
line: 24
12+
character: 36
13+
line: 13
1414
uri: data/references.robot
1515
- !Location
1616
range:
1717
end:
18-
character: 46
19-
line: 13
18+
character: 10
19+
line: 24
2020
start:
21-
character: 36
22-
line: 13
21+
character: 0
22+
line: 24
2323
uri: data/references.robot
2424
- !Location
2525
range:

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_013_045_Variable_in_library_params_.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ result:
66
- !Location
77
range:
88
end:
9-
character: 10
10-
line: 24
9+
character: 46
10+
line: 13
1111
start:
12-
character: 0
13-
line: 24
12+
character: 36
13+
line: 13
1414
uri: data/references.robot
1515
- !Location
1616
range:
1717
end:
18-
character: 46
19-
line: 13
18+
character: 10
19+
line: 24
2020
start:
21-
character: 36
22-
line: 13
21+
character: 0
22+
line: 24
2323
uri: data/references.robot
2424
- !Location
2525
range:

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_016_023_suite_fixture_keyword_call_with_namespace_.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ data: !GeneratedTestData
33
line: 16
44
name: suite fixture keyword call with namespace
55
result:
6-
- !Location
7-
range:
8-
end:
9-
character: 37
10-
line: 16
11-
start:
12-
character: 23
13-
line: 16
14-
uri: libraries/BuiltIn.py
156
- !Location
167
range:
178
end:
@@ -156,3 +147,12 @@ result:
156147
character: 26
157148
line: 51
158149
uri: data/references.robot
150+
- !Location
151+
range:
152+
end:
153+
character: 37
154+
line: 16
155+
start:
156+
character: 23
157+
line: 16
158+
uri: libraries/BuiltIn.py

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_016_030_suite_fixture_keyword_call_with_namespace_.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ data: !GeneratedTestData
33
line: 16
44
name: suite fixture keyword call with namespace
55
result:
6-
- !Location
7-
range:
8-
end:
9-
character: 37
10-
line: 16
11-
start:
12-
character: 23
13-
line: 16
14-
uri: libraries/BuiltIn.py
156
- !Location
167
range:
178
end:
@@ -156,3 +147,12 @@ result:
156147
character: 26
157148
line: 51
158149
uri: data/references.robot
150+
- !Location
151+
range:
152+
end:
153+
character: 37
154+
line: 16
155+
start:
156+
character: 23
157+
line: 16
158+
uri: libraries/BuiltIn.py

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_016_036_suite_fixture_keyword_call_with_namespace_.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ data: !GeneratedTestData
33
line: 16
44
name: suite fixture keyword call with namespace
55
result:
6-
- !Location
7-
range:
8-
end:
9-
character: 37
10-
line: 16
11-
start:
12-
character: 23
13-
line: 16
14-
uri: libraries/BuiltIn.py
156
- !Location
167
range:
178
end:
@@ -156,3 +147,12 @@ result:
156147
character: 26
157148
line: 51
158149
uri: data/references.robot
150+
- !Location
151+
range:
152+
end:
153+
character: 37
154+
line: 16
155+
start:
156+
character: 23
157+
line: 16
158+
uri: libraries/BuiltIn.py

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_018_014_test_fixture_keyword_call_with_namespace_.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ data: !GeneratedTestData
33
line: 18
44
name: test fixture keyword call with namespace
55
result:
6-
- !Location
7-
range:
8-
end:
9-
character: 28
10-
line: 18
11-
start:
12-
character: 14
13-
line: 18
14-
uri: libraries/BuiltIn.py
156
- !Location
167
range:
178
end:
@@ -156,3 +147,12 @@ result:
156147
character: 26
157148
line: 51
158149
uri: data/references.robot
150+
- !Location
151+
range:
152+
end:
153+
character: 28
154+
line: 18
155+
start:
156+
character: 14
157+
line: 18
158+
uri: libraries/BuiltIn.py

‎tests/robotcode/language_server/robotframework/parts/test_references/test_references_robot_018_021_test_fixture_keyword_call_with_namespace_.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ data: !GeneratedTestData
33
line: 18
44
name: test fixture keyword call with namespace
55
result:
6-
- !Location
7-
range:
8-
end:
9-
character: 28
10-
line: 18
11-
start:
12-
character: 14
13-
line: 18
14-
uri: libraries/BuiltIn.py
156
- !Location
167
range:
178
end:
@@ -156,3 +147,12 @@ result:
156147
character: 26
157148
line: 51
158149
uri: data/references.robot
150+
- !Location
151+
range:
152+
end:
153+
character: 28
154+
line: 18
155+
start:
156+
character: 14
157+
line: 18
158+
uri: libraries/BuiltIn.py

0 commit comments

Comments
 (0)