Skip to content

Commit 537d0dd

Browse files
sergeypospelovsergeypospelov
committed
Fix failed tests in OptionalTest.kt
1 parent d37fdff commit 537d0dd

File tree

1 file changed

+35
-34
lines changed

1 file changed

+35
-34
lines changed

‎utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.utbot.examples.singleValue
1010
import org.utbot.framework.codegen.CodeGeneration
1111
import org.utbot.framework.plugin.api.CodegenLanguage
1212
import org.junit.jupiter.api.Test
13+
import java.util.*
1314

1415
class OptionalsTest : UtValueTestCaseChecker(
1516
Optionals::class,
@@ -67,7 +68,7 @@ class OptionalsTest : UtValueTestCaseChecker(
6768
checkStatics(
6869
Optionals::createNullable,
6970
eq(2),
70-
{ value, statics, result -> value == null && result === statics.singleValue() },
71+
{ value, _, result -> value == null && result === Optional.empty<Int>() },
7172
{ value, _, result -> value != null && result!!.get() == value },
7273
coverage = DoNotCalculate
7374
)
@@ -78,7 +79,7 @@ class OptionalsTest : UtValueTestCaseChecker(
7879
checkStatics(
7980
Optionals::createEmpty,
8081
eq(1),
81-
{ statics, result -> result === statics.singleValue() },
82+
{ _, result -> result === Optional.empty<Int>() },
8283
coverage = DoNotCalculate
8384
)
8485
}
@@ -88,7 +89,7 @@ class OptionalsTest : UtValueTestCaseChecker(
8889
checkStatics(
8990
Optionals::createIntEmpty,
9091
eq(1),
91-
{ statics, result -> result === statics.singleValue() },
92+
{ _, result -> result === OptionalInt.empty() },
9293
coverage = DoNotCalculate
9394
)
9495
}
@@ -98,7 +99,7 @@ class OptionalsTest : UtValueTestCaseChecker(
9899
checkStatics(
99100
Optionals::createLongEmpty,
100101
eq(1),
101-
{ statics, result -> result === statics.singleValue() },
102+
{ _, result -> result === OptionalLong.empty() },
102103
coverage = DoNotCalculate
103104
)
104105
}
@@ -108,7 +109,7 @@ class OptionalsTest : UtValueTestCaseChecker(
108109
checkStatics(
109110
Optionals::createDoubleEmpty,
110111
eq(1),
111-
{ statics, result -> result === statics.singleValue() },
112+
{ _, result -> result === OptionalDouble.empty() },
112113
coverage = DoNotCalculate
113114
)
114115
}
@@ -119,7 +120,7 @@ class OptionalsTest : UtValueTestCaseChecker(
119120
Optionals::getValue,
120121
eq(3),
121122
{ optional, _, _ -> optional == null },
122-
{ optional, statics, result -> optional != null && optional === statics.singleValue() && result == null },
123+
{ optional, _, result -> optional != null && optional === Optional.empty<Int>() && result == null },
123124
{ optional, _, result -> optional != null && result == optional.get() },
124125
coverage = DoNotCalculate
125126
)
@@ -131,7 +132,7 @@ class OptionalsTest : UtValueTestCaseChecker(
131132
Optionals::getIntValue,
132133
eq(3),
133134
{ optional, _, _ -> optional == null },
134-
{ optional, statics, result -> optional != null && optional === statics.singleValue() && result == null },
135+
{ optional, _, result -> optional != null && optional === OptionalInt.empty() && result == null },
135136
{ optional, _, result -> optional != null && result == optional.asInt },
136137
coverage = DoNotCalculate
137138
)
@@ -143,7 +144,7 @@ class OptionalsTest : UtValueTestCaseChecker(
143144
Optionals::getLongValue,
144145
eq(3),
145146
{ optional, _, _ -> optional == null },
146-
{ optional, statics, result -> optional != null && optional === statics.singleValue() && result == null },
147+
{ optional, _, result -> optional != null && optional === OptionalLong.empty() && result == null },
147148
{ optional, _, result -> optional != null && result == optional.asLong },
148149
coverage = DoNotCalculate
149150
)
@@ -155,7 +156,7 @@ class OptionalsTest : UtValueTestCaseChecker(
155156
Optionals::getDoubleValue,
156157
eq(3),
157158
{ optional, _, _ -> optional == null },
158-
{ optional, statics, result -> optional != null && optional === statics.singleValue() && result == null },
159+
{ optional, _, result -> optional != null && optional === OptionalDouble.empty() && result == null },
159160
{ optional, _, result -> optional != null && result == optional.asDouble },
160161
coverage = DoNotCalculate
161162
)
@@ -167,7 +168,7 @@ class OptionalsTest : UtValueTestCaseChecker(
167168
Optionals::getWithIsPresent,
168169
eq(3),
169170
{ optional, _, _ -> optional == null },
170-
{ optional, statics, result -> optional === statics.singleValue() && result == null },
171+
{ optional, _, result -> optional === Optional.empty<Int>() && result == null },
171172
{ optional, _, result -> optional.get() == result },
172173
coverage = DoNotCalculate
173174
)
@@ -179,7 +180,7 @@ class OptionalsTest : UtValueTestCaseChecker(
179180
Optionals::countIfPresent,
180181
eq(3),
181182
{ optional, _, _ -> optional == null },
182-
{ optional, statics, result -> optional === statics.singleValue() && result == 0 },
183+
{ optional, _, result -> optional === Optional.empty<Int>() && result == 0 },
183184
{ optional, _, result -> optional.get() == result },
184185
coverage = DoNotCalculate
185186
)
@@ -191,7 +192,7 @@ class OptionalsTest : UtValueTestCaseChecker(
191192
Optionals::countIntIfPresent,
192193
ignoreExecutionsNumber,
193194
{ optional, _, _ -> optional == null },
194-
{ optional, statics, result -> optional === statics.singleValue() && result == 0 },
195+
{ optional, _, result -> optional === OptionalInt.empty() && result == 0 },
195196
{ optional, _, result -> optional.asInt == result },
196197
)
197198
}
@@ -202,7 +203,7 @@ class OptionalsTest : UtValueTestCaseChecker(
202203
Optionals::countLongIfPresent,
203204
ignoreExecutionsNumber,
204205
{ optional, _, _ -> optional == null },
205-
{ optional, statics, result -> optional === statics.singleValue() && result == 0L },
206+
{ optional, _, result -> optional === OptionalLong.empty() && result == 0L },
206207
{ optional, _, result -> optional.asLong == result },
207208
)
208209
}
@@ -213,7 +214,7 @@ class OptionalsTest : UtValueTestCaseChecker(
213214
Optionals::countDoubleIfPresent,
214215
ignoreExecutionsNumber,
215216
{ optional, _, _ -> optional == null },
216-
{ optional, statics, result -> optional === statics.singleValue() && result == 0.0 },
217+
{ optional, _, result -> optional === OptionalDouble.empty() && result == 0.0 },
217218
{ optional, _, result -> optional.asDouble == result },
218219
)
219220
}
@@ -224,9 +225,9 @@ class OptionalsTest : UtValueTestCaseChecker(
224225
Optionals::filterLessThanZero,
225226
eq(4),
226227
{ optional, _, _ -> optional == null },
227-
{ optional, statics, result -> optional === statics.singleValue() && result === optional },
228+
{ optional, _, result -> optional === Optional.empty<Int>() && result === optional },
228229
{ optional, _, result -> optional.get() >= 0 && result == optional },
229-
{ optional, statics, result -> optional.get() < 0 && result === statics.singleValue() },
230+
{ optional, _, result -> optional.get() < 0 && result === Optional.empty<Int>() },
230231
coverage = DoNotCalculate
231232
)
232233
}
@@ -237,7 +238,7 @@ class OptionalsTest : UtValueTestCaseChecker(
237238
Optionals::absNotNull,
238239
eq(4),
239240
{ optional, _, _ -> optional == null },
240-
{ optional, statics, result -> optional === statics.singleValue() && result === optional },
241+
{ optional, _, result -> optional === Optional.empty<Int>() && result === optional },
241242
{ optional, _, result -> optional.get() < 0 && result!!.get() == -optional.get() },
242243
{ optional, _, result -> optional.get() >= 0 && result == optional },
243244
coverage = DoNotCalculate
@@ -250,8 +251,8 @@ class OptionalsTest : UtValueTestCaseChecker(
250251
Optionals::mapLessThanZeroToNull,
251252
eq(4),
252253
{ optional, _, _ -> optional == null },
253-
{ optional, statics, result -> optional === statics.singleValue() && result === optional },
254-
{ optional, statics, result -> optional.get() < 0 && result === statics.singleValue() },
254+
{ optional, _, result -> optional === Optional.empty<Int>() && result === optional },
255+
{ optional, _, result -> optional.get() < 0 && result === Optional.empty<Int>() },
255256
{ optional, _, result -> optional.get() >= 0 && result == optional },
256257
coverage = DoNotCalculate
257258
)
@@ -263,7 +264,7 @@ class OptionalsTest : UtValueTestCaseChecker(
263264
Optionals::flatAbsNotNull,
264265
eq(4),
265266
{ optional, _, _ -> optional == null },
266-
{ optional, statics, result -> optional === statics.singleValue() && result === optional },
267+
{ optional, _, result -> optional === Optional.empty<Int>() && result === optional },
267268
{ optional, _, result -> optional.get() < 0 && result!!.get() == -optional.get() },
268269
{ optional, _, result -> optional.get() >= 0 && result == optional },
269270
coverage = DoNotCalculate
@@ -276,8 +277,8 @@ class OptionalsTest : UtValueTestCaseChecker(
276277
Optionals::flatMapWithNull,
277278
eq(5),
278279
{ optional, _, _ -> optional == null },
279-
{ optional, statics, result -> optional === statics.singleValue() && result === optional },
280-
{ optional, statics, result -> optional.get() < 0 && result === statics.singleValue() },
280+
{ optional, _, result -> optional === Optional.empty<Int>() && result === optional },
281+
{ optional, _, result -> optional.get() < 0 && result === Optional.empty<Int>() },
281282
{ optional, _, result -> optional.get() > 0 && result == optional },
282283
{ optional, _, result -> optional.get() == 0 && result == null },
283284
coverage = DoNotCalculate
@@ -290,7 +291,7 @@ class OptionalsTest : UtValueTestCaseChecker(
290291
Optionals::leftOrElseRight,
291292
eq(3),
292293
{ left, _, _, _ -> left == null },
293-
{ left, right, statics, result -> left === statics.singleValue() && result == right },
294+
{ left, right, _, result -> left === Optional.empty<Int>() && result == right },
294295
{ left, _, _, result -> left.isPresent && result == left.get() },
295296
coverage = DoNotCalculate
296297
)
@@ -302,7 +303,7 @@ class OptionalsTest : UtValueTestCaseChecker(
302303
Optionals::leftIntOrElseRight,
303304
eq(3),
304305
{ left, _, _, _ -> left == null },
305-
{ left, right, statics, result -> left === statics.singleValue() && result == right },
306+
{ left, right, _, result -> left === OptionalInt.empty() && result == right },
306307
{ left, _, _, result -> left.isPresent && result == left.asInt },
307308
coverage = DoNotCalculate
308309
)
@@ -315,7 +316,7 @@ class OptionalsTest : UtValueTestCaseChecker(
315316
Optionals::leftLongOrElseRight,
316317
eq(3),
317318
{ left, _, _, _ -> left == null },
318-
{ left, right, statics, result -> left === statics.singleValue() && result == right },
319+
{ left, right, _, result -> left === OptionalLong.empty() && result == right },
319320
{ left, _, _, result -> left.isPresent && result == left.asLong },
320321
coverage = DoNotCalculate
321322
)
@@ -328,7 +329,7 @@ class OptionalsTest : UtValueTestCaseChecker(
328329
Optionals::leftDoubleOrElseRight,
329330
eq(3),
330331
{ left, _, _, _ -> left == null },
331-
{ left, right, statics, result -> left === statics.singleValue() && (result == right || result!!.isNaN() && right.isNaN()) },
332+
{ left, right, _, result -> left === OptionalDouble.empty() && (result == right || result!!.isNaN() && right.isNaN()) },
332333
{ left, _, _, result -> left.isPresent && (result == left.asDouble || result!!.isNaN() && left.asDouble.isNaN()) },
333334
coverage = DoNotCalculate
334335
)
@@ -341,7 +342,7 @@ class OptionalsTest : UtValueTestCaseChecker(
341342
Optionals::leftOrElseGetOne,
342343
eq(3),
343344
{ left, _, _ -> left == null },
344-
{ left, statics, result -> left === statics.singleValue() && result == 1 },
345+
{ left, _, result -> left === Optional.empty<Int>() && result == 1 },
345346
{ left, _, result -> left.isPresent && result == left.get() },
346347
coverage = DoNotCalculate
347348
)
@@ -353,7 +354,7 @@ class OptionalsTest : UtValueTestCaseChecker(
353354
Optionals::leftIntOrElseGetOne,
354355
eq(3),
355356
{ left, _, _ -> left == null },
356-
{ left, statics, result -> left === statics.singleValue() && result == 1 },
357+
{ left, _, result -> left === OptionalInt.empty() && result == 1 },
357358
{ left, _, result -> left.isPresent && result == left.asInt },
358359
coverage = DoNotCalculate
359360
)
@@ -365,7 +366,7 @@ class OptionalsTest : UtValueTestCaseChecker(
365366
Optionals::leftLongOrElseGetOne,
366367
eq(3),
367368
{ left, _, _ -> left == null },
368-
{ left, statics, result -> left === statics.singleValue() && result == 1L },
369+
{ left, _, result -> left === OptionalLong.empty() && result == 1L },
369370
{ left, _, result -> left.isPresent && result == left.asLong },
370371
coverage = DoNotCalculate
371372
)
@@ -377,7 +378,7 @@ class OptionalsTest : UtValueTestCaseChecker(
377378
Optionals::leftDoubleOrElseGetOne,
378379
eq(3),
379380
{ left, _, _ -> left == null },
380-
{ left, statics, result -> left === statics.singleValue() && result == 1.0 },
381+
{ left, _, result -> left === OptionalDouble.empty() && result == 1.0 },
381382
{ left, _, result -> left.isPresent && result == left.asDouble },
382383
coverage = DoNotCalculate
383384
)
@@ -389,7 +390,7 @@ class OptionalsTest : UtValueTestCaseChecker(
389390
Optionals::leftOrElseThrow,
390391
eq(3),
391392
{ left, _, _ -> left == null },
392-
{ left, statics, result -> left === statics.singleValue() && result == null },
393+
{ left, _, result -> left === Optional.empty<Int>() && result == null },
393394
{ left, _, result -> left.isPresent && result == left.get() },
394395
coverage = DoNotCalculate
395396
)
@@ -401,7 +402,7 @@ class OptionalsTest : UtValueTestCaseChecker(
401402
Optionals::leftIntOrElseThrow,
402403
eq(3),
403404
{ left, _, _ -> left == null },
404-
{ left, statics, result -> left === statics.singleValue() && result == null },
405+
{ left, _, result -> left === OptionalInt.empty() && result == null },
405406
{ left, _, result -> left.isPresent && result == left.asInt },
406407
coverage = DoNotCalculate
407408
)
@@ -413,7 +414,7 @@ class OptionalsTest : UtValueTestCaseChecker(
413414
Optionals::leftLongOrElseThrow,
414415
eq(3),
415416
{ left, _, _ -> left == null },
416-
{ left, statics, result -> left === statics.singleValue() && result == null },
417+
{ left, _, result -> left === OptionalLong.empty() && result == null },
417418
{ left, _, result -> left.isPresent && result == left.asLong },
418419
coverage = DoNotCalculate
419420
)
@@ -425,7 +426,7 @@ class OptionalsTest : UtValueTestCaseChecker(
425426
Optionals::leftDoubleOrElseThrow,
426427
eq(3),
427428
{ left, _, _ -> left == null },
428-
{ left, statics, result -> left === statics.singleValue() && result == null },
429+
{ left, _, result -> left === OptionalDouble.empty() && result == null },
429430
{ left, _, result -> left.isPresent && result == left.asDouble },
430431
coverage = DoNotCalculate
431432
)

0 commit comments

Comments
 (0)