@@ -62,275 +62,9 @@ class FuzzTests
62
62
}
63
63
}
64
64
65
- val gen = GeneratedProgram (
66
- List (
67
- TypeDef (
68
- Spanned (" OptT0" , Span .synth),
69
- List (
70
- EnumCase (
71
- Spanned (" SomeT0" , Span .synth),
72
- List (FieldDef (false , Spanned (" value" , Span .synth), TypeRef (" T0" , Span .synth), Span .synth)),
73
- Span .synth
74
- ),
75
- EnumCase (Spanned (" NoneT0" , Span .synth), List (), Span .synth)
76
- ),
77
- Span .synth
78
- ),
79
- TypeDef (
80
- Spanned (" OptT1" , Span .synth),
81
- List (
82
- EnumCase (
83
- Spanned (" SomeT1" , Span .synth),
84
- List (FieldDef (false , Spanned (" value" , Span .synth), TypeRef (" T1" , Span .synth), Span .synth)),
85
- Span .synth
86
- ),
87
- EnumCase (Spanned (" NoneT1" , Span .synth), List (), Span .synth)
88
- ),
89
- Span .synth
90
- ),
91
- TypeDef (
92
- Spanned (" OptT2" , Span .synth),
93
- List (
94
- EnumCase (
95
- Spanned (" SomeT2" , Span .synth),
96
- List (FieldDef (false , Spanned (" value" , Span .synth), TypeRef (" T2" , Span .synth), Span .synth)),
97
- Span .synth
98
- ),
99
- EnumCase (Spanned (" NoneT2" , Span .synth), List (), Span .synth)
100
- ),
101
- Span .synth
102
- ),
103
- TypeDef (
104
- Spanned (" T2" , Span .synth),
105
- List (EnumCase (
106
- Spanned (" T2" , Span .synth),
107
- List (
108
- FieldDef (false , Spanned (" f3" , Span .synth), TypeRef (" T1" , Span .synth), Span .synth),
109
- FieldDef (true , Spanned (" f1" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth),
110
- FieldDef (true , Spanned (" f6" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth),
111
- FieldDef (true , Spanned (" f10" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth),
112
- FieldDef (true , Spanned (" f4" , Span .synth), TypeRef (" OptT0" , Span .synth), Span .synth),
113
- FieldDef (true , Spanned (" f2" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth),
114
- FieldDef (false , Spanned (" f0" , Span .synth), TypeRef (" T1" , Span .synth), Span .synth),
115
- FieldDef (true , Spanned (" f11" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth),
116
- FieldDef (true , Spanned (" f7" , Span .synth), TypeRef (" OptT0" , Span .synth), Span .synth),
117
- FieldDef (true , Spanned (" f8" , Span .synth), TypeRef (" OptT0" , Span .synth), Span .synth),
118
- FieldDef (true , Spanned (" f9" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth),
119
- FieldDef (true , Spanned (" f5" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth)
120
- ),
121
- Span .synth
122
- )),
123
- Span .synth
124
- ),
125
- TypeDef (
126
- Spanned (" T0" , Span .synth),
127
- List (EnumCase (
128
- Spanned (" T0" , Span .synth),
129
- List (
130
- FieldDef (true , Spanned (" f0" , Span .synth), TypeRef (" OptT0" , Span .synth), Span .synth),
131
- FieldDef (true , Spanned (" f1" , Span .synth), TypeRef (" OptT2" , Span .synth), Span .synth)
132
- ),
133
- Span .synth
134
- )),
135
- Span .synth
136
- ),
137
- TypeDef (
138
- Spanned (" T1" , Span .synth),
139
- List (EnumCase (
140
- Spanned (" T1" , Span .synth),
141
- List (FieldDef (true , Spanned (" f0" , Span .synth), TypeRef (" OptT1" , Span .synth), Span .synth)),
142
- Span .synth
143
- )),
144
- Span .synth
145
- )
146
- ),
147
- Map (
148
- " vT2_1" -> " T2" ,
149
- " vT1_1" -> " T1" ,
150
- " vT0_3" -> " T0" ,
151
- " vT0_0" -> " T0" ,
152
- " vT0_1" -> " T0" ,
153
- " vT1_3" -> " T1" ,
154
- " vT2_0" -> " T2" ,
155
- " vT0_2" -> " T0" ,
156
- " vT2_2" -> " T2" ,
157
- " vT1_0" -> " T1" ,
158
- " vT1_2" -> " T1" ,
159
- " vT2_3" -> " T2"
160
- ),
161
- List (
162
- (
163
- " vT0_3" ,
164
- CtorCall (
165
- Spanned (" T0" , Span .synth),
166
- List (
167
- (Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
168
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
169
- ),
170
- Span .synth
171
- )
172
- ),
173
- (
174
- " vT2_1" ,
175
- CtorCall (
176
- Spanned (" T2" , Span .synth),
177
- List (
178
- (Spanned (" f3" , Span .synth), VarRef (" vT1_2" , Span .synth)),
179
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
180
- (Spanned (" f6" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
181
- (Spanned (" f10" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
182
- (Spanned (" f4" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
183
- (Spanned (" f2" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
184
- (Spanned (" f0" , Span .synth), VarRef (" vT1_2" , Span .synth)),
185
- (Spanned (" f11" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
186
- (Spanned (" f7" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
187
- (Spanned (" f8" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
188
- (Spanned (" f9" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
189
- (Spanned (" f5" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
190
- ),
191
- Span .synth
192
- )
193
- ),
194
- (
195
- " vT0_1" ,
196
- CtorCall (
197
- Spanned (" T0" , Span .synth),
198
- List (
199
- (Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
200
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
201
- ),
202
- Span .synth
203
- )
204
- ),
205
- (
206
- " vT2_3" ,
207
- CtorCall (
208
- Spanned (" T2" , Span .synth),
209
- List (
210
- (Spanned (" f3" , Span .synth), VarRef (" vT1_0" , Span .synth)),
211
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
212
- (Spanned (" f6" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
213
- (Spanned (" f10" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
214
- (Spanned (" f4" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
215
- (Spanned (" f2" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
216
- (Spanned (" f0" , Span .synth), VarRef (" vT1_1" , Span .synth)),
217
- (Spanned (" f11" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
218
- (Spanned (" f7" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
219
- (Spanned (" f8" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
220
- (Spanned (" f9" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
221
- (Spanned (" f5" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
222
- ),
223
- Span .synth
224
- )
225
- ),
226
- (
227
- " vT2_0" ,
228
- CtorCall (
229
- Spanned (" T2" , Span .synth),
230
- List (
231
- (Spanned (" f3" , Span .synth), VarRef (" vT1_3" , Span .synth)),
232
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
233
- (Spanned (" f6" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
234
- (Spanned (" f10" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
235
- (Spanned (" f4" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
236
- (Spanned (" f2" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
237
- (Spanned (" f0" , Span .synth), VarRef (" vT1_2" , Span .synth)),
238
- (Spanned (" f11" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
239
- (Spanned (" f7" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
240
- (Spanned (" f8" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
241
- (Spanned (" f9" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
242
- (Spanned (" f5" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
243
- ),
244
- Span .synth
245
- )
246
- ),
247
- (
248
- " vT2_2" ,
249
- CtorCall (
250
- Spanned (" T2" , Span .synth),
251
- List (
252
- (Spanned (" f3" , Span .synth), VarRef (" vT1_2" , Span .synth)),
253
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
254
- (Spanned (" f6" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
255
- (Spanned (" f10" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
256
- (Spanned (" f4" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
257
- (Spanned (" f2" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
258
- (Spanned (" f0" , Span .synth), VarRef (" vT1_1" , Span .synth)),
259
- (Spanned (" f11" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
260
- (Spanned (" f7" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
261
- (Spanned (" f8" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
262
- (Spanned (" f9" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth)),
263
- (Spanned (" f5" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
264
- ),
265
- Span .synth
266
- )
267
- ),
268
- (
269
- " vT0_0" ,
270
- CtorCall (
271
- Spanned (" T0" , Span .synth),
272
- List (
273
- (Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
274
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
275
- ),
276
- Span .synth
277
- )
278
- ),
279
- (
280
- " vT0_2" ,
281
- CtorCall (
282
- Spanned (" T0" , Span .synth),
283
- List (
284
- (Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT0" , Span .synth), List (), Span .synth)),
285
- (Spanned (" f1" , Span .synth), CtorCall (Spanned (" NoneT2" , Span .synth), List (), Span .synth))
286
- ),
287
- Span .synth
288
- )
289
- ),
290
- (
291
- " vT1_0" ,
292
- CtorCall (
293
- Spanned (" T1" , Span .synth),
294
- List ((Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT1" , Span .synth), List (), Span .synth))),
295
- Span .synth
296
- )
297
- ),
298
- (
299
- " vT1_1" ,
300
- CtorCall (
301
- Spanned (" T1" , Span .synth),
302
- List ((Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT1" , Span .synth), List (), Span .synth))),
303
- Span .synth
304
- )
305
- ),
306
- (
307
- " vT1_2" ,
308
- CtorCall (
309
- Spanned (" T1" , Span .synth),
310
- List ((Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT1" , Span .synth), List (), Span .synth))),
311
- Span .synth
312
- )
313
- ),
314
- (
315
- " vT1_3" ,
316
- CtorCall (
317
- Spanned (" T1" , Span .synth),
318
- List ((Spanned (" f0" , Span .synth), CtorCall (Spanned (" NoneT1" , Span .synth), List (), Span .synth))),
319
- Span .synth
320
- )
321
- )
322
- ),
323
- List (
324
- GenStmt .Assign (" vT0_3" , " f0" , " T0" , " vT0_1" ),
325
- GenStmt .Assign (" vT0_1" , " f0" , " T0" , " vT0_1" ),
326
- GenStmt .ValgrindCheck ,
327
- GenStmt .Assign (" vT0_0" , " f0" , " T0" , " vT0_3" )
328
- )
329
- )
330
-
331
65
property(" With intermediate checks" , Slow ) {
332
66
given PropertyCheckConfiguration =
333
- PropertyCheckConfiguration (minSize = 5 , sizeRange = 40 )
67
+ PropertyCheckConfiguration (minSize = 5 , sizeRange = 60 )
334
68
given Shrink [GeneratedProgram ] = GenUtil .shrinkGenerated
335
69
336
70
// TODO maybe randomness isn't needed here, just insert one check every few statements or something
@@ -367,8 +101,7 @@ class FuzzTests
367
101
)
368
102
}
369
103
370
- // forAll(genFull.apply(Parameters.default, Seed(6529581269390504088L)).get) {
371
- forAll(Gen .const(gen)) {
104
+ forAll(genFull) {
372
105
generated =>
373
106
ExecTests .valgrindCheck(
374
107
generated.asAst,
0 commit comments