Skip to content

Commit fcd8ee0

Browse files
simonmarsimonmar
committed
[scip-to-glean facebookincubator#2] Update Rust, Typescript and Python-scip tests
1 parent 745e392 commit fcd8ee0

42 files changed

Lines changed: 1326 additions & 593 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎glean/lang/codemarkup/tests/typescript/Glean/Regression/TypeScript/Main.hs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ import Glean.Regression.Snapshot
1515
import Glean.Regression.Snapshot.Driver
1616

1717
main :: IO ()
18-
main = getArgs >>= \args -> withArgs (args ++ ["--root", path]) $
19-
testMain (driverFromIndexer Typescript.indexer)
18+
main = getArgs >>= \args ->
19+
withArgs (args ++ ["--rust-indexer", scipToGlean, "--root", path]) $
20+
testMain (driverFromIndexer Typescript.indexer)
2021
where
2122
path = "glean/lang/typescript/tests/cases"
23+
scipToGlean =
24+
"glean/lang/scip/indexer/scip_to_glean/target/release/scip-to-glean"

‎glean/lang/dotnet-scip/tests/Glean/Regression/DotnetScip/Main.hs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ import Glean.Regression.Snapshot
1515
import Glean.Regression.Snapshot.Driver
1616

1717
main :: IO ()
18-
main = getArgs >>= \args -> withArgs (args ++ ["--root", path]) $
19-
testMain (driverFromIndexer DotnetScip.indexer)
18+
main = getArgs >>= \args ->
19+
withArgs (args ++ ["--rust-indexer", scipToGlean, "--root", path]) $
20+
testMain (driverFromIndexer DotnetScip.indexer)
2021
where
2122
path = "glean/lang/dotnet-scip/tests/cases"
23+
scipToGlean =
24+
"glean/lang/scip/indexer/scip_to_glean/target/release/scip-to-glean"

‎glean/lang/dotnet-scip/tests/cases/xrefs/LocalName.out‎

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,34 @@
11
[
22
"@generated",
3+
{ "key": "" },
4+
{ "key": ".ctor" },
35
{ "key": "Collections" },
6+
{ "key": "Console" },
7+
{ "key": "Dog" },
8+
{ "key": "Empty" },
9+
{ "key": "ExecuteInheritance" },
10+
{ "key": "FrameworkDisplayName" },
411
{ "key": "Generic" },
512
{ "key": "Http" },
13+
{ "key": "Human" },
614
{ "key": "IO" },
715
{ "key": "Linq" },
16+
{ "key": "Main" },
17+
{ "key": "Mammal" },
818
{ "key": "Net" },
19+
{ "key": "NumberOfLegs" },
920
{ "key": "Reflection" },
10-
{ "key": "Reflection/AssemblyCompanyAttribute#`.ctor`()" },
11-
{ "key": "Reflection/AssemblyConfigurationAttribute#`.ctor`()" },
12-
{ "key": "Reflection/AssemblyFileVersionAttribute#`.ctor`()" },
13-
{ "key": "Reflection/AssemblyInformationalVersionAttribute#`.ctor`()" },
14-
{ "key": "Reflection/AssemblyProductAttribute#`.ctor`()" },
15-
{ "key": "Reflection/AssemblyTitleAttribute#`.ctor`()" },
16-
{ "key": "Reflection/AssemblyVersionAttribute#`.ctor`()" },
1721
{ "key": "Runtime" },
22+
{ "key": "Specie" },
1823
{ "key": "System" },
19-
{ "key": "System/Console" },
20-
{ "key": "System/Console#WriteLine(+11)" },
21-
{ "key": "System/String#Empty" },
2224
{ "key": "Tasks" },
2325
{ "key": "Threading" },
2426
{ "key": "Versioning" },
25-
{ "key": "Versioning/TargetFrameworkAttribute#FrameworkDisplayName" },
26-
{ "key": "Versioning/TargetFrameworkAttribute#`.ctor`()" },
27-
{ "key": "``" },
28-
{ "key": "``/Dog" },
29-
{ "key": "``/Dog#`.ctor`()" },
30-
{ "key": "``/ExecuteInheritance" },
31-
{ "key": "``/ExecuteInheritance#Main()" },
32-
{ "key": "``/ExecuteInheritance#Main().(args" },
33-
{ "key": "``/Human" },
34-
{ "key": "``/Human#`.ctor`()" },
35-
{ "key": "``/Mammal" },
36-
{ "key": "``/Mammal#NumberOfLegs" },
37-
{ "key": "``/Mammal#Specie" },
38-
{ "key": "``/Mammal#`.ctor`()" },
39-
{ "key": "``/Mammal#`.ctor`(+1)" },
40-
{ "key": "``/Mammal#`.ctor`(+1).(numberOfLegs" },
41-
{ "key": "``/Mammal#`.ctor`(+1).(specie" },
42-
{ "key": "``/Mammal#numberOfLegs" },
43-
{ "key": "``/Mammal#specie" },
27+
{ "key": "WriteLine" },
28+
{ "key": "args" },
4429
{ "key": "local 0" },
4530
{ "key": "local 1" },
46-
{ "key": "local 2" }
31+
{ "key": "local 2" },
32+
{ "key": "numberOfLegs" },
33+
{ "key": "specie" }
4734
]

‎glean/lang/dotnet-scip/tests/cases/xrefs/LocalName.perf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"@generated": null,
3-
"facts_searched": { "scip.LocalName.1": 44 },
3+
"facts_searched": { "scip.LocalName.1": 31 },
44
"full_scans": [ "scip.LocalName.1" ]
55
}

‎glean/lang/dotnet-scip/tests/cases/xrefs/SymbolName.out‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -93,211 +93,207 @@
9393
{
9494
"key": {
9595
"symbol": { "key": "scip-dotnet nuget . . ``/" },
96-
"name": { "key": "``" }
96+
"name": { "key": "" }
9797
}
9898
},
9999
{
100100
"key": {
101101
"symbol": { "key": "scip-dotnet nuget . . ``/Dog#" },
102-
"name": { "key": "``/Dog" }
102+
"name": { "key": "Dog" }
103103
}
104104
},
105105
{
106106
"key": {
107107
"symbol": { "key": "scip-dotnet nuget . . ``/Dog#`.ctor`()." },
108-
"name": { "key": "``/Dog#`.ctor`()" }
108+
"name": { "key": ".ctor" }
109109
}
110110
},
111111
{
112112
"key": {
113113
"symbol": { "key": "scip-dotnet nuget . . ``/ExecuteInheritance#" },
114-
"name": { "key": "``/ExecuteInheritance" }
114+
"name": { "key": "ExecuteInheritance" }
115115
}
116116
},
117117
{
118118
"key": {
119119
"symbol": {
120120
"key": "scip-dotnet nuget . . ``/ExecuteInheritance#Main()."
121121
},
122-
"name": { "key": "``/ExecuteInheritance#Main()" }
122+
"name": { "key": "Main" }
123123
}
124124
},
125125
{
126126
"key": {
127127
"symbol": {
128128
"key": "scip-dotnet nuget . . ``/ExecuteInheritance#Main().(args)"
129129
},
130-
"name": { "key": "``/ExecuteInheritance#Main().(args" }
130+
"name": { "key": "args" }
131131
}
132132
},
133133
{
134134
"key": {
135135
"symbol": { "key": "scip-dotnet nuget . . ``/Human#" },
136-
"name": { "key": "``/Human" }
136+
"name": { "key": "Human" }
137137
}
138138
},
139139
{
140140
"key": {
141141
"symbol": { "key": "scip-dotnet nuget . . ``/Human#`.ctor`()." },
142-
"name": { "key": "``/Human#`.ctor`()" }
142+
"name": { "key": ".ctor" }
143143
}
144144
},
145145
{
146146
"key": {
147147
"symbol": { "key": "scip-dotnet nuget . . ``/Mammal#" },
148-
"name": { "key": "``/Mammal" }
148+
"name": { "key": "Mammal" }
149149
}
150150
},
151151
{
152152
"key": {
153153
"symbol": { "key": "scip-dotnet nuget . . ``/Mammal#NumberOfLegs." },
154-
"name": { "key": "``/Mammal#NumberOfLegs" }
154+
"name": { "key": "NumberOfLegs" }
155155
}
156156
},
157157
{
158158
"key": {
159159
"symbol": { "key": "scip-dotnet nuget . . ``/Mammal#Specie." },
160-
"name": { "key": "``/Mammal#Specie" }
160+
"name": { "key": "Specie" }
161161
}
162162
},
163163
{
164164
"key": {
165165
"symbol": { "key": "scip-dotnet nuget . . ``/Mammal#`.ctor`()." },
166-
"name": { "key": "``/Mammal#`.ctor`()" }
166+
"name": { "key": ".ctor" }
167167
}
168168
},
169169
{
170170
"key": {
171171
"symbol": { "key": "scip-dotnet nuget . . ``/Mammal#`.ctor`(+1)." },
172-
"name": { "key": "``/Mammal#`.ctor`(+1)" }
172+
"name": { "key": ".ctor" }
173173
}
174174
},
175175
{
176176
"key": {
177177
"symbol": {
178178
"key": "scip-dotnet nuget . . ``/Mammal#`.ctor`(+1).(numberOfLegs)"
179179
},
180-
"name": { "key": "``/Mammal#`.ctor`(+1).(numberOfLegs" }
180+
"name": { "key": "numberOfLegs" }
181181
}
182182
},
183183
{
184184
"key": {
185185
"symbol": {
186186
"key": "scip-dotnet nuget . . ``/Mammal#`.ctor`(+1).(specie)"
187187
},
188-
"name": { "key": "``/Mammal#`.ctor`(+1).(specie" }
188+
"name": { "key": "specie" }
189189
}
190190
},
191191
{
192192
"key": {
193193
"symbol": { "key": "scip-dotnet nuget . . ``/Mammal#numberOfLegs." },
194-
"name": { "key": "``/Mammal#numberOfLegs" }
194+
"name": { "key": "numberOfLegs" }
195195
}
196196
},
197197
{
198198
"key": {
199199
"symbol": { "key": "scip-dotnet nuget . . ``/Mammal#specie." },
200-
"name": { "key": "``/Mammal#specie" }
200+
"name": { "key": "specie" }
201201
}
202202
},
203203
{
204204
"key": {
205205
"symbol": {
206206
"key": "scip-dotnet nuget System.Console 7.0.0.0 System/Console#"
207207
},
208-
"name": { "key": "System/Console" }
208+
"name": { "key": "Console" }
209209
}
210210
},
211211
{
212212
"key": {
213213
"symbol": {
214214
"key": "scip-dotnet nuget System.Console 7.0.0.0 System/Console#WriteLine(+11)."
215215
},
216-
"name": { "key": "System/Console#WriteLine(+11)" }
216+
"name": { "key": "WriteLine" }
217217
}
218218
},
219219
{
220220
"key": {
221221
"symbol": {
222222
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Reflection/AssemblyCompanyAttribute#`.ctor`()."
223223
},
224-
"name": { "key": "Reflection/AssemblyCompanyAttribute#`.ctor`()" }
224+
"name": { "key": ".ctor" }
225225
}
226226
},
227227
{
228228
"key": {
229229
"symbol": {
230230
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Reflection/AssemblyConfigurationAttribute#`.ctor`()."
231231
},
232-
"name": { "key": "Reflection/AssemblyConfigurationAttribute#`.ctor`()" }
232+
"name": { "key": ".ctor" }
233233
}
234234
},
235235
{
236236
"key": {
237237
"symbol": {
238238
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Reflection/AssemblyFileVersionAttribute#`.ctor`()."
239239
},
240-
"name": { "key": "Reflection/AssemblyFileVersionAttribute#`.ctor`()" }
240+
"name": { "key": ".ctor" }
241241
}
242242
},
243243
{
244244
"key": {
245245
"symbol": {
246246
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Reflection/AssemblyInformationalVersionAttribute#`.ctor`()."
247247
},
248-
"name": {
249-
"key": "Reflection/AssemblyInformationalVersionAttribute#`.ctor`()"
250-
}
248+
"name": { "key": ".ctor" }
251249
}
252250
},
253251
{
254252
"key": {
255253
"symbol": {
256254
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Reflection/AssemblyProductAttribute#`.ctor`()."
257255
},
258-
"name": { "key": "Reflection/AssemblyProductAttribute#`.ctor`()" }
256+
"name": { "key": ".ctor" }
259257
}
260258
},
261259
{
262260
"key": {
263261
"symbol": {
264262
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Reflection/AssemblyTitleAttribute#`.ctor`()."
265263
},
266-
"name": { "key": "Reflection/AssemblyTitleAttribute#`.ctor`()" }
264+
"name": { "key": ".ctor" }
267265
}
268266
},
269267
{
270268
"key": {
271269
"symbol": {
272270
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Reflection/AssemblyVersionAttribute#`.ctor`()."
273271
},
274-
"name": { "key": "Reflection/AssemblyVersionAttribute#`.ctor`()" }
272+
"name": { "key": ".ctor" }
275273
}
276274
},
277275
{
278276
"key": {
279277
"symbol": {
280278
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 System/String#Empty."
281279
},
282-
"name": { "key": "System/String#Empty" }
280+
"name": { "key": "Empty" }
283281
}
284282
},
285283
{
286284
"key": {
287285
"symbol": {
288286
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Versioning/TargetFrameworkAttribute#FrameworkDisplayName."
289287
},
290-
"name": {
291-
"key": "Versioning/TargetFrameworkAttribute#FrameworkDisplayName"
292-
}
288+
"name": { "key": "FrameworkDisplayName" }
293289
}
294290
},
295291
{
296292
"key": {
297293
"symbol": {
298294
"key": "scip-dotnet nuget System.Runtime 7.0.0.0 Versioning/TargetFrameworkAttribute#`.ctor`()."
299295
},
300-
"name": { "key": "Versioning/TargetFrameworkAttribute#`.ctor`()" }
296+
"name": { "key": ".ctor" }
301297
}
302298
}
303299
]

‎glean/lang/python-scip/tests/Glean/Regression/PythonScip/Main.hs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ import Glean.Regression.Snapshot
1515
import Glean.Regression.Snapshot.Driver
1616

1717
main :: IO ()
18-
main = getArgs >>= \args -> withArgs (args ++ ["--root", path]) $
19-
testMain (driverFromIndexer PythonScip.indexer)
18+
main = getArgs >>= \args ->
19+
withArgs (args ++ ["--rust-indexer", scipToGlean, "--root", path]) $
20+
testMain (driverFromIndexer PythonScip.indexer)
2021
where
2122
path = "glean/lang/python-scip/tests/cases"
23+
scipToGlean =
24+
"glean/lang/scip/indexer/scip_to_glean/target/release/scip-to-glean"

‎glean/lang/python-scip/tests/cases/xrefs/Definition.out‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
[
22
"@generated",
3+
{
4+
"key": {
5+
"symbol": { "key": "example.py/local 0" },
6+
"location": {
7+
"key": {
8+
"file": { "key": "example.py" },
9+
"range": {
10+
"lineBegin": 76,
11+
"columnBegin": 9,
12+
"lineEnd": 76,
13+
"columnEnd": 9
14+
}
15+
}
16+
}
17+
}
18+
},
19+
{
20+
"key": {
21+
"symbol": { "key": "example.py/local 1" },
22+
"location": {
23+
"key": {
24+
"file": { "key": "example.py" },
25+
"range": {
26+
"lineBegin": 82,
27+
"columnBegin": 9,
28+
"lineEnd": 82,
29+
"columnEnd": 9
30+
}
31+
}
32+
}
33+
}
34+
},
335
{
436
"key": {
537
"symbol": { "key": "scip-python python . test example/__init__:" },

0 commit comments

Comments
 (0)