Skip to content

Commit 0489c6a

Browse files
DamtevDamtev
committed
Fixed tests
1 parent 49a5852 commit 0489c6a

File tree

9 files changed

+102
-155
lines changed

9 files changed

+102
-155
lines changed

‎utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,10 @@ class BaseStreamExampleTest : UtValueTestCaseChecker(
8484
checkWithException(
8585
BaseStreamExample::mapToIntExample,
8686
ignoreExecutionsNumber,
87-
{ c, r -> null in c && r.isException<NullPointerException>() },
88-
{ c, r -> r.getOrThrow().contentEquals(c.map { it.toInt() }.toIntArray()) },
87+
{ c, r ->
88+
(null in c && r.isException<NullPointerException>()) ||
89+
r.getOrThrow().contentEquals(c.map { it.toInt() }.toIntArray())
90+
},
8991
coverage = AtLeast(90)
9092
)
9193
}
@@ -95,8 +97,10 @@ class BaseStreamExampleTest : UtValueTestCaseChecker(
9597
checkWithException(
9698
BaseStreamExample::mapToLongExample,
9799
ignoreExecutionsNumber,
98-
{ c, r -> null in c && r.isException<NullPointerException>() },
99-
{ c, r -> r.getOrThrow().contentEquals(c.map { it.toLong() }.toLongArray()) },
100+
{ c, r ->
101+
(null in c && r.isException<NullPointerException>()) ||
102+
r.getOrThrow().contentEquals(c.map { it.toLong() }.toLongArray())
103+
},
100104
coverage = AtLeast(90)
101105
)
102106
}
@@ -106,8 +110,10 @@ class BaseStreamExampleTest : UtValueTestCaseChecker(
106110
checkWithException(
107111
BaseStreamExample::mapToDoubleExample,
108112
ignoreExecutionsNumber,
109-
{ c, r -> null in c && r.isException<NullPointerException>() },
110-
{ c, r -> r.getOrThrow().contentEquals(c.map { it.toDouble() }.toDoubleArray()) },
113+
{ c, r ->
114+
(null in c && r.isException<NullPointerException>()) ||
115+
r.getOrThrow().contentEquals(c.map { it.toDouble() }.toDoubleArray())
116+
},
111117
coverage = AtLeast(90)
112118
)
113119
}
@@ -466,7 +472,8 @@ class BaseStreamExampleTest : UtValueTestCaseChecker(
466472
check(
467473
BaseStreamExample::sourceCollectionMutationExample,
468474
eq(1),
469-
{ r -> r == true }
475+
{ r -> r == true },
476+
coverage = AtLeast(97)
470477
)
471478
}
472479
}

‎utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/DoubleStreamExampleTest.kt

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class DoubleStreamExampleTest : UtValueTestCaseChecker(
2828
CodeGenerationLanguageLastStage(CodegenLanguage.KOTLIN, CodeGeneration)
2929
)
3030
) {
31+
@Disabled("TODO enable after anonymous function support")
3132
@Test
3233
fun testReturningStreamExample() {
3334
check(
@@ -40,6 +41,7 @@ class DoubleStreamExampleTest : UtValueTestCaseChecker(
4041
)
4142
}
4243

44+
@Disabled("TODO enable after anonymous function support")
4345
@Test
4446
fun testReturningStreamAsParameterExample() {
4547
withoutConcrete {
@@ -68,8 +70,10 @@ class DoubleStreamExampleTest : UtValueTestCaseChecker(
6870
check(
6971
DoubleStreamExample::mapExample,
7072
ignoreExecutionsNumber,
71-
{ c, r -> null in c && r.contentEquals(c.doubles { it?.toDouble()?.times(2) ?: 0.0 }) },
72-
{ c: List<Short?>, r -> null !in c && r.contentEquals(c.doubles { it?.toDouble()?.times(2) ?: 0.0 }) },
73+
{ c, r ->
74+
(null in c && r.contentEquals(c.doubles { it?.toDouble()?.times(2) ?: 0.0 })) ||
75+
(null !in c && r.contentEquals(c.doubles { it?.toDouble()?.times(2) ?: 0.0 }))
76+
},
7377
coverage = FullWithAssumptions(assumeCallsNumber = 1)
7478
)
7579
}
@@ -82,14 +86,11 @@ class DoubleStreamExampleTest : UtValueTestCaseChecker(
8286
{ c, r ->
8387
val intArrays = c.doubles().map { it.let { i -> doubleArrayOf(i, i) } }.toTypedArray()
8488

85-
null in c && intArrays.zip(r as Array<out Any>)
86-
.all { it.first.contentEquals(it.second as DoubleArray?) }
87-
},
88-
{ c: List<Short?>, r ->
89-
val intArrays = c.doubles().map { it.let { i -> doubleArrayOf(i, i) } }.toTypedArray()
90-
91-
null !in c && intArrays.zip(r as Array<out Any>)
92-
.all { it.first.contentEquals(it.second as DoubleArray?) }
89+
intArrays
90+
.zip(r as Array<out Any>)
91+
.all {
92+
it.first.contentEquals(it.second as DoubleArray?)
93+
}
9394
},
9495
coverage = FullWithAssumptions(assumeCallsNumber = 1)
9596
)
@@ -103,12 +104,7 @@ class DoubleStreamExampleTest : UtValueTestCaseChecker(
103104
{ c, r ->
104105
val ints = c.doubles().map { it.toInt() }.toIntArray()
105106

106-
null in c && ints.contentEquals(r)
107-
},
108-
{ c: List<Short?>, r ->
109-
val ints = c.doubles().map { it.toInt() }.toIntArray()
110-
111-
null !in c && ints.contentEquals(r)
107+
ints.contentEquals(r)
112108
},
113109
coverage = FullWithAssumptions(assumeCallsNumber = 1)
114110
)
@@ -122,12 +118,7 @@ class DoubleStreamExampleTest : UtValueTestCaseChecker(
122118
{ c, r ->
123119
val longs = c.doubles().map { it.toLong() }.toLongArray()
124120

125-
null in c && longs.contentEquals(r)
126-
},
127-
{ c: List<Short?>, r ->
128-
val longs = c.doubles().map { it.toLong() }.toLongArray()
129-
130-
null !in c && longs.contentEquals(r)
121+
longs.contentEquals(r)
131122
},
132123
coverage = FullWithAssumptions(assumeCallsNumber = 1)
133124
)

‎utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/IntStreamExampleTest.kt

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class IntStreamExampleTest : UtValueTestCaseChecker(
2929
CodeGenerationLanguageLastStage(CodegenLanguage.KOTLIN, CodeGeneration)
3030
)
3131
) {
32+
@Disabled("TODO enable after anonymous function support")
3233
@Test
3334
fun testReturningStreamExample() {
3435
check(
@@ -41,6 +42,7 @@ class IntStreamExampleTest : UtValueTestCaseChecker(
4142
)
4243
}
4344

45+
@Disabled("TODO enable after anonymous function support")
4446
@Test
4547
fun testReturningStreamAsParameterExample() {
4648
withoutConcrete {
@@ -69,8 +71,7 @@ class IntStreamExampleTest : UtValueTestCaseChecker(
6971
check(
7072
IntStreamExample::mapExample,
7173
ignoreExecutionsNumber,
72-
{ c, r -> null in c && r.contentEquals(c.ints { it?.toInt()?.times(2) ?: 0 }) },
73-
{ c: List<Short?>, r -> null !in c && r.contentEquals(c.ints { it?.toInt()?.times(2) ?: 0 }) },
74+
{ c, r -> r.contentEquals(c.ints { it?.toInt()?.times(2) ?: 0 }) },
7475
coverage = FullWithAssumptions(assumeCallsNumber = 1)
7576
)
7677
}
@@ -83,12 +84,11 @@ class IntStreamExampleTest : UtValueTestCaseChecker(
8384
{ c, r ->
8485
val intArrays = c.ints().map { it.let { i -> intArrayOf(i, i) } }.toTypedArray()
8586

86-
null in c && intArrays.zip(r as Array<out Any>).all { it.first.contentEquals(it.second as IntArray?) }
87-
},
88-
{ c: List<Short?>, r ->
89-
val intArrays = c.ints().map { it.let { i -> intArrayOf(i, i) } }.toTypedArray()
90-
91-
null !in c && intArrays.zip(r as Array<out Any>).all { it.first.contentEquals(it.second as IntArray?) }
87+
intArrays
88+
.zip(r as Array<out Any>)
89+
.all {
90+
it.first.contentEquals(it.second as IntArray?)
91+
}
9292
},
9393
coverage = FullWithAssumptions(assumeCallsNumber = 1)
9494
)
@@ -102,12 +102,7 @@ class IntStreamExampleTest : UtValueTestCaseChecker(
102102
{ c, r ->
103103
val longs = c.ints().map { it.toLong() * 2 }.toLongArray()
104104

105-
null in c && longs.contentEquals(r)
106-
},
107-
{ c: List<Short?>, r ->
108-
val longs = c.ints().map { it.toLong() * 2 }.toLongArray()
109-
110-
null !in c && longs.contentEquals(r)
105+
longs.contentEquals(r)
111106
},
112107
coverage = FullWithAssumptions(assumeCallsNumber = 1)
113108
)
@@ -121,12 +116,7 @@ class IntStreamExampleTest : UtValueTestCaseChecker(
121116
{ c, r ->
122117
val doubles = c.ints().map { it.toDouble() / 2 }.toDoubleArray()
123118

124-
null in c && doubles.contentEquals(r)
125-
},
126-
{ c: List<Short?>, r ->
127-
val doubles = c.filterNotNull().map { it.toDouble() / 2 }.toDoubleArray()
128-
129-
null !in c && doubles.contentEquals(r)
119+
doubles.contentEquals(r)
130120
},
131121
coverage = FullWithAssumptions(assumeCallsNumber = 1)
132122
)

‎utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/LongStreamExampleTest.kt

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class LongStreamExampleTest : UtValueTestCaseChecker(
2929
CodeGenerationLanguageLastStage(CodegenLanguage.KOTLIN, CodeGeneration)
3030
)
3131
) {
32+
@Disabled("TODO enable after anonymous function support")
3233
@Test
3334
fun testReturningStreamExample() {
3435
check(
@@ -41,6 +42,7 @@ class LongStreamExampleTest : UtValueTestCaseChecker(
4142
)
4243
}
4344

45+
@Disabled("TODO enable after anonymous function support")
4446
@Test
4547
fun testReturningStreamAsParameterExample() {
4648
withoutConcrete {
@@ -69,8 +71,7 @@ class LongStreamExampleTest : UtValueTestCaseChecker(
6971
check(
7072
LongStreamExample::mapExample,
7173
ignoreExecutionsNumber,
72-
{ c, r -> null in c && r.contentEquals(c.longs { it?.toLong()?.times(2) ?: 0L }) },
73-
{ c: List<Short?>, r -> null !in c && r.contentEquals(c.longs { it?.toLong()?.times(2) ?: 0L }) },
74+
{ c, r -> r.contentEquals(c.longs { it?.toLong()?.times(2) ?: 0L }) },
7475
coverage = FullWithAssumptions(assumeCallsNumber = 1)
7576
)
7677
}
@@ -83,12 +84,11 @@ class LongStreamExampleTest : UtValueTestCaseChecker(
8384
{ c, r ->
8485
val intArrays = c.longs().map { it.let { i -> longArrayOf(i, i) } }.toTypedArray()
8586

86-
null in c && intArrays.zip(r as Array<out Any>).all { it.first.contentEquals(it.second as LongArray?) }
87-
},
88-
{ c: List<Short?>, r ->
89-
val intArrays = c.longs().map { it.let { i -> longArrayOf(i, i) } }.toTypedArray()
90-
91-
null !in c && intArrays.zip(r as Array<out Any>).all { it.first.contentEquals(it.second as LongArray?) }
87+
intArrays
88+
.zip(r as Array<out Any>)
89+
.all {
90+
it.first.contentEquals(it.second as LongArray?)
91+
}
9292
},
9393
coverage = FullWithAssumptions(assumeCallsNumber = 1)
9494
)
@@ -102,12 +102,7 @@ class LongStreamExampleTest : UtValueTestCaseChecker(
102102
{ c, r ->
103103
val ints = c.longs().map { it.toInt() }.toIntArray()
104104

105-
null in c && ints.contentEquals(r)
106-
},
107-
{ c: List<Short?>, r ->
108-
val ints = c.longs().map { it.toInt() }.toIntArray()
109-
110-
null !in c && ints.contentEquals(r)
105+
ints.contentEquals(r)
111106
},
112107
coverage = FullWithAssumptions(assumeCallsNumber = 1)
113108
)
@@ -121,12 +116,7 @@ class LongStreamExampleTest : UtValueTestCaseChecker(
121116
{ c, r ->
122117
val doubles = c.longs().map { it.toDouble() / 2 }.toDoubleArray()
123118

124-
null in c && doubles.contentEquals(r)
125-
},
126-
{ c: List<Short?>, r ->
127-
val doubles = c.filterNotNull().map { it.toDouble() / 2 }.toDoubleArray()
128-
129-
null !in c && doubles.contentEquals(r)
119+
doubles.contentEquals(r)
130120
},
131121
coverage = FullWithAssumptions(assumeCallsNumber = 1)
132122
)

‎utbot-framework/src/main/kotlin/org/utbot/framework/util/SootUtils.kt

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,10 @@ import org.utbot.engine.overrides.stream.UtIntStream
4545
import org.utbot.engine.overrides.stream.UtLongStream
4646
import org.utbot.engine.overrides.stream.UtStream
4747
import org.utbot.engine.overrides.stream.actions.*
48-
import org.utbot.engine.overrides.stream.actions.objects.ConsumerAction
49-
import org.utbot.engine.overrides.stream.actions.DistinctAction
50-
import org.utbot.engine.overrides.stream.actions.objects.FilterAction
51-
import org.utbot.engine.overrides.stream.actions.LimitAction
52-
import org.utbot.engine.overrides.stream.actions.objects.MapAction
53-
import org.utbot.engine.overrides.stream.actions.NaturalSortingAction
54-
import org.utbot.engine.overrides.stream.actions.SkipAction
55-
import org.utbot.engine.overrides.stream.actions.objects.SortingAction
48+
import org.utbot.engine.overrides.stream.actions.objects.*
49+
import org.utbot.engine.overrides.stream.actions.primitives.doubles.*
50+
import org.utbot.engine.overrides.stream.actions.primitives.ints.*
51+
import org.utbot.engine.overrides.stream.actions.primitives.longs.*
5652
import org.utbot.engine.pureJavaSignature
5753
import org.utbot.framework.plugin.api.UtMethod
5854
import org.utbot.framework.plugin.api.util.signature
@@ -208,13 +204,46 @@ private val classesToLoad = arrayOf(
208204
IntStream::class,
209205
LongStream::class,
210206
DoubleStream::class,
207+
208+
// abstract stream action
211209
StreamAction::class,
212-
ConsumerAction::class,
210+
211+
// common stream actions
213212
DistinctAction::class,
214-
FilterAction::class,
215213
LimitAction::class,
216-
MapAction::class,
217214
NaturalSortingAction::class,
218215
SkipAction::class,
216+
217+
// objects specific stream actions
218+
ConsumerAction::class,
219+
FilterAction::class,
220+
MapAction::class,
219221
SortingAction::class,
222+
ToDoubleMapAction::class,
223+
ToIntMapAction::class,
224+
ToLongMapAction::class,
225+
226+
// doubles specific stream actions
227+
DoubleConsumerAction::class,
228+
DoubleFilterAction::class,
229+
DoubleMapAction::class,
230+
DoubleToIntMapAction::class,
231+
DoubleToLongMapAction::class,
232+
DoubleToObjMapAction::class,
233+
234+
// ints specific stream actions
235+
IntConsumerAction::class,
236+
IntFilterAction::class,
237+
IntMapAction::class,
238+
IntToDoubleMapAction::class,
239+
IntToLongMapAction::class,
240+
IntToObjMapAction::class,
241+
242+
// longs specific stream actions
243+
LongConsumerAction::class,
244+
LongFilterAction::class,
245+
LongMapAction::class,
246+
LongToIntMapAction::class,
247+
LongToDoubleMapAction::class,
248+
LongToObjMapAction::class,
220249
)

‎utbot-sample/src/main/java/org/utbot/examples/stream/BaseStreamExample.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,31 +65,19 @@ Integer[] mapExample(List<Integer> list) {
6565
int[] mapToIntExample(List<Short> list) {
6666
UtMock.assume(list != null && !list.isEmpty());
6767

68-
if (list.contains(null)) {
69-
return list.stream().mapToInt(Short::intValue).toArray();
70-
} else {
71-
return list.stream().mapToInt(Short::intValue).toArray();
72-
}
68+
return list.stream().mapToInt(Short::intValue).toArray();
7369
}
7470

7571
long[] mapToLongExample(List<Short> list) {
7672
UtMock.assume(list != null && !list.isEmpty());
7773

78-
if (list.contains(null)) {
79-
return list.stream().mapToLong(Short::longValue).toArray();
80-
} else {
81-
return list.stream().mapToLong(Short::longValue).toArray();
82-
}
74+
return list.stream().mapToLong(Short::longValue).toArray();
8375
}
8476

8577
double[] mapToDoubleExample(List<Short> list) {
8678
UtMock.assume(list != null && !list.isEmpty());
8779

88-
if (list.contains(null)) {
89-
return list.stream().mapToDouble(Short::doubleValue).toArray();
90-
} else {
91-
return list.stream().mapToDouble(Short::doubleValue).toArray();
92-
}
80+
return list.stream().mapToDouble(Short::doubleValue).toArray();
9381
}
9482

9583
Object[] flatMapExample(List<Integer> list) {

0 commit comments

Comments
 (0)