Skip to content

Commit f6b3b53

Browse files
committed
Make coverage test resilient to changes in stdlib
1 parent 99176ac commit f6b3b53

File tree

2 files changed

+116
-45
lines changed

2 files changed

+116
-45
lines changed

tests/coverage/pos/Inlined.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ package covtest
33
// Checks that we use the new positions of the inlined code properly
44
def testInlined(): Unit =
55
val l = 1
6-
assert(l == 1) // scala.Predef.assert is inline in dotty
6+
assert(l == 1)
77
assert(l == List(l).length)
88
assert(List(l).length == 1)
9+
10+
transparent inline def assert(inline assertion: Boolean): Unit =
11+
if !assertion then scala.runtime.Scala3RunTime.assertFailed()

tests/coverage/pos/Inlined.scoverage.check

Lines changed: 112 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ false
3636
l == 1
3737

3838
1
39-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
39+
Inlined.scala
4040
covtest
4141
Inlined$package$
4242
Object
4343
covtest.Inlined$package$
4444
testInlined
45-
340
46-
367
47-
9
45+
288
46+
315
47+
10
4848
Scala3RunTime
4949
Select
5050
false
@@ -53,15 +53,15 @@ false
5353
scala.runtime.Scala3RunTime
5454

5555
2
56-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
56+
Inlined.scala
5757
covtest
5858
Inlined$package$
5959
Object
6060
covtest.Inlined$package$
6161
testInlined
62-
340
63-
382
64-
9
62+
288
63+
330
64+
10
6565
assertFailed
6666
Apply
6767
false
@@ -70,15 +70,15 @@ false
7070
scala.runtime.Scala3RunTime.assertFailed()
7171

7272
3
73-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
73+
Inlined.scala
7474
covtest
7575
Inlined$package$
7676
Object
7777
covtest.Inlined$package$
7878
testInlined
79-
340
80-
382
81-
9
79+
288
80+
330
81+
10
8282
<none>
8383
Block
8484
true
@@ -93,8 +93,8 @@ Inlined$package$
9393
Object
9494
covtest.Inlined$package$
9595
testInlined
96-
197
97-
204
96+
155
97+
162
9898
6
9999
apply
100100
Apply
@@ -110,8 +110,8 @@ Inlined$package$
110110
Object
111111
covtest.Inlined$package$
112112
testInlined
113-
192
114-
211
113+
150
114+
169
115115
6
116116
==
117117
Apply
@@ -121,15 +121,15 @@ false
121121
l == List(l).length
122122

123123
6
124-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
124+
Inlined.scala
125125
covtest
126126
Inlined$package$
127127
Object
128128
covtest.Inlined$package$
129129
testInlined
130-
340
131-
367
132-
9
130+
288
131+
315
132+
10
133133
Scala3RunTime
134134
Select
135135
false
@@ -138,15 +138,15 @@ false
138138
scala.runtime.Scala3RunTime
139139

140140
7
141-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
141+
Inlined.scala
142142
covtest
143143
Inlined$package$
144144
Object
145145
covtest.Inlined$package$
146146
testInlined
147-
340
148-
382
149-
9
147+
288
148+
330
149+
10
150150
assertFailed
151151
Apply
152152
false
@@ -155,15 +155,15 @@ false
155155
scala.runtime.Scala3RunTime.assertFailed()
156156

157157
8
158-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
158+
Inlined.scala
159159
covtest
160160
Inlined$package$
161161
Object
162162
covtest.Inlined$package$
163163
testInlined
164-
340
165-
382
166-
9
164+
288
165+
330
166+
10
167167
<none>
168168
Block
169169
true
@@ -178,8 +178,8 @@ Inlined$package$
178178
Object
179179
covtest.Inlined$package$
180180
testInlined
181-
222
182-
229
181+
180
182+
187
183183
7
184184
apply
185185
Apply
@@ -195,8 +195,8 @@ Inlined$package$
195195
Object
196196
covtest.Inlined$package$
197197
testInlined
198-
222
199-
241
198+
180
199+
199
200200
7
201201
==
202202
Apply
@@ -206,15 +206,15 @@ false
206206
List(l).length == 1
207207

208208
11
209-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
209+
Inlined.scala
210210
covtest
211211
Inlined$package$
212212
Object
213213
covtest.Inlined$package$
214214
testInlined
215-
340
216-
367
217-
9
215+
288
216+
315
217+
10
218218
Scala3RunTime
219219
Select
220220
false
@@ -223,15 +223,15 @@ false
223223
scala.runtime.Scala3RunTime
224224

225225
12
226-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
226+
Inlined.scala
227227
covtest
228228
Inlined$package$
229229
Object
230230
covtest.Inlined$package$
231231
testInlined
232-
340
233-
382
234-
9
232+
288
233+
330
234+
10
235235
assertFailed
236236
Apply
237237
false
@@ -240,15 +240,15 @@ false
240240
scala.runtime.Scala3RunTime.assertFailed()
241241

242242
13
243-
../../../library/src/scala/runtime/stdLibPatches/Predef.scala
243+
Inlined.scala
244244
covtest
245245
Inlined$package$
246246
Object
247247
covtest.Inlined$package$
248248
testInlined
249-
340
250-
382
251-
9
249+
288
250+
330
251+
10
252252
<none>
253253
Block
254254
true
@@ -273,3 +273,71 @@ false
273273
false
274274
def testInlined
275275

276+
15
277+
Inlined.scala
278+
covtest
279+
Inlined$package$
280+
Object
281+
covtest.Inlined$package$
282+
assert
283+
288
284+
315
285+
10
286+
Scala3RunTime
287+
Select
288+
false
289+
0
290+
false
291+
scala.runtime.Scala3RunTime
292+
293+
16
294+
Inlined.scala
295+
covtest
296+
Inlined$package$
297+
Object
298+
covtest.Inlined$package$
299+
assert
300+
288
301+
330
302+
10
303+
assertFailed
304+
Apply
305+
false
306+
0
307+
false
308+
scala.runtime.Scala3RunTime.assertFailed()
309+
310+
17
311+
Inlined.scala
312+
covtest
313+
Inlined$package$
314+
Object
315+
covtest.Inlined$package$
316+
assert
317+
288
318+
330
319+
10
320+
<none>
321+
Block
322+
true
323+
0
324+
false
325+
scala.runtime.Scala3RunTime.assertFailed()
326+
327+
18
328+
Inlined.scala
329+
covtest
330+
Inlined$package$
331+
Object
332+
covtest.Inlined$package$
333+
assert
334+
202
335+
231
336+
9
337+
assert
338+
DefDef
339+
false
340+
0
341+
false
342+
transparent inline def assert
343+

0 commit comments

Comments
 (0)