Skip to content

Commit d314672

Browse files
sergeypospelovsergeypospelov
committed
Fix tests
1 parent 9aaa136 commit d314672

File tree

7 files changed

+136
-86
lines changed

7 files changed

+136
-86
lines changed

‎utbot-instrumentation-tests/src/test/java/org/utbot/examples/samples/ExampleClass.java

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package org.utbot.examples.samples;
2+
3+
@SuppressWarnings("All")
4+
public class ExampleClass {
5+
int x1 = 1;
6+
7+
boolean[] arr = new boolean[5];
8+
9+
boolean[] arr2 = new boolean[10];
10+
11+
public void bar(int x) {
12+
if (x > 1) {
13+
x1++;
14+
x1++;
15+
} else {
16+
x1--;
17+
x1--;
18+
}
19+
}
20+
21+
public void kek2(int x) {
22+
arr[x] = true;
23+
}
24+
25+
public int foo(int x) {
26+
x1 = x ^ 2;
27+
28+
boolean was = false;
29+
30+
for (int i = 0; i < x; i++) {
31+
was = true;
32+
int x2 = 0;
33+
if (i > 5) {
34+
was = false;
35+
x2 = 1;
36+
}
37+
if (was && x2 == 0) {
38+
was = true;
39+
}
40+
}
41+
42+
// empty lines
43+
return was ? x1 : x1 + 1;
44+
}
45+
46+
public void dependsOnField() {
47+
x1 = x1 ^ 1;
48+
if ((x1 & 1) == 1) {
49+
x1 += 4;
50+
} else {
51+
x1 += 2;
52+
}
53+
}
54+
55+
public int dependsOnFieldReturn() {
56+
x1 = x1 ^ 1;
57+
if ((x1 & 1) == 1) {
58+
x1 += 4;
59+
} else {
60+
x1 += 2;
61+
}
62+
return x1;
63+
}
64+
65+
public void emptyMethod() {
66+
}
67+
68+
@SuppressWarnings("unused")
69+
public int use() {
70+
return arr2.length;
71+
}
72+
}

‎utbot-instrumentation-tests/src/test/java/org/utbot/test/util/UtPair.java

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package org.utbot.test.util;
2+
3+
import java.io.Serializable;
4+
5+
@SuppressWarnings("All")
6+
public class UtPair<K, V> implements Serializable {
7+
8+
private K key;
9+
10+
public K getKey() { return key; }
11+
12+
private V value;
13+
14+
public V getValue() { return value; }
15+
16+
public UtPair(K key, V value) {
17+
this.key = key;
18+
this.value = value;
19+
}
20+
21+
@Override
22+
public String toString() {
23+
return key + "=" + value;
24+
}
25+
26+
@Override
27+
public int hashCode() {
28+
return key.hashCode() * 13 + (value == null ? 0 : value.hashCode());
29+
}
30+
31+
@Override
32+
public boolean equals(Object o) {
33+
if (this == o) return true;
34+
if (o instanceof UtPair) {
35+
UtPair pair = (UtPair) o;
36+
if (key != null ? !key.equals(pair.key) : pair.key != null) return false;
37+
if (value != null ? !value.equals(pair.value) : pair.value != null) return false;
38+
return true;
39+
}
40+
return false;
41+
}
42+
}
43+

‎utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestCoverageInstrumentation.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TestCoverageInstrumentation {
3232
val coverageInfo = it.collectCoverage(ExampleClass::class.java)
3333

3434
assertEquals(5, coverageInfo.visitedInstrs.size)
35-
assertEquals(50..55, coverageInfo.methodToInstrRange[ExampleClass::kek2.signature])
35+
assertEquals(43..48, coverageInfo.methodToInstrRange[ExampleClass::kek2.signature])
3636
assertTrue(res.exceptionOrNull() is ArrayIndexOutOfBoundsException)
3737
}
3838
}
@@ -48,14 +48,14 @@ class TestCoverageInstrumentation {
4848
it.execute(ExampleClass::bar, arrayOf(testObject, 2))
4949
val coverageInfo1 = it.collectCoverage(ExampleClass::class.java)
5050

51-
assertEquals(21, coverageInfo1.visitedInstrs.size)
52-
assertEquals(13..49, coverageInfo1.methodToInstrRange[ExampleClass::bar.signature])
51+
assertEquals(17, coverageInfo1.visitedInstrs.size)
52+
assertEquals(14..42, coverageInfo1.methodToInstrRange[ExampleClass::bar.signature])
5353

5454
it.execute(ExampleClass::bar, arrayOf(testObject, 0))
5555
val coverageInfo2 = it.collectCoverage(ExampleClass::class.java)
5656

57-
assertEquals(20, coverageInfo2.visitedInstrs.size)
58-
assertEquals(13..49, coverageInfo2.methodToInstrRange[ExampleClass::bar.signature])
57+
assertEquals(16, coverageInfo2.visitedInstrs.size)
58+
assertEquals(14..42, coverageInfo2.methodToInstrRange[ExampleClass::bar.signature])
5959
}
6060
}
6161

@@ -103,14 +103,14 @@ class TestCoverageInstrumentation {
103103
it.execute(ExampleClass::bar, arrayOf(testObject, 2))
104104
val coverageInfo1 = it.collectCoverage(ExampleClass::class.java)
105105

106-
assertEquals(21, coverageInfo1.visitedInstrs.size)
107-
assertEquals(13..49, coverageInfo1.methodToInstrRange[ExampleClass::bar.signature])
106+
assertEquals(17, coverageInfo1.visitedInstrs.size)
107+
assertEquals(14..42, coverageInfo1.methodToInstrRange[ExampleClass::bar.signature])
108108

109109
it.execute(ExampleClass::bar, arrayOf(testObject, 0))
110110
val coverageInfo2 = it.collectCoverage(ExampleClass::class.java)
111111

112-
assertEquals(20, coverageInfo2.visitedInstrs.size)
113-
assertEquals(13..49, coverageInfo2.methodToInstrRange[ExampleClass::bar.signature])
112+
assertEquals(16, coverageInfo2.visitedInstrs.size)
113+
assertEquals(14..42, coverageInfo2.methodToInstrRange[ExampleClass::bar.signature])
114114
}
115115
}
116116

@@ -127,13 +127,13 @@ class TestCoverageInstrumentation {
127127
val coverageInfo1 = it.collectCoverage(ExampleClass::class.java)
128128

129129
assertEquals(19, coverageInfo1.visitedInstrs.size)
130-
assertEquals(99..124, coverageInfo1.methodToInstrRange[ExampleClass::dependsOnField.signature])
130+
assertEquals(90..115, coverageInfo1.methodToInstrRange[ExampleClass::dependsOnField.signature])
131131

132132
it.execute(ExampleClass::dependsOnField, arrayOf(testObject))
133133
val coverageInfo2 = it.collectCoverage(ExampleClass::class.java)
134134

135135
assertEquals(19, coverageInfo2.visitedInstrs.size)
136-
assertEquals(99..124, coverageInfo2.methodToInstrRange[ExampleClass::dependsOnField.signature])
136+
assertEquals(90..115, coverageInfo2.methodToInstrRange[ExampleClass::dependsOnField.signature])
137137
}
138138
}
139139

@@ -149,8 +149,8 @@ class TestCoverageInstrumentation {
149149
val coverageInfo = it.collectCoverage(ExampleClass::class.java)
150150

151151
assertEquals(1, res.getOrNull())
152-
assertEquals(35, coverageInfo.visitedInstrs.size)
153-
assertEquals(56..98, coverageInfo.methodToInstrRange[ExampleClass::foo.signature])
152+
assertEquals(33, coverageInfo.visitedInstrs.size)
153+
assertEquals(49..89, coverageInfo.methodToInstrRange[ExampleClass::foo.signature])
154154
}
155155
}
156156

‎utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestGetSourceFileName.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class TestGetSourceFileName {
3131
}
3232

3333
@Test
34-
fun testKotlinExample() {
35-
assertEquals("ExampleClass.kt", Instrumenter.computeSourceFileName(ExampleClass::class.java))
34+
fun testJavaExample1() {
35+
assertEquals("ExampleClass.java", Instrumenter.computeSourceFileName(ExampleClass::class.java))
3636
}
3737

3838
@Test
39-
fun testJavaExample() {
39+
fun testJavaExample2() {
4040
assertEquals(
4141
"ClassWithInnerClasses.java",
4242
Instrumenter.computeSourceFileName(ClassWithInnerClasses::class.java)

‎utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/Classes.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.utbot.examples.benchmark
22

3-
import org.utbot.UtPair
3+
import org.utbot.test.util.UtPair
44

55

66
class Repeater(var sep: String) {

‎utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/TestBenchmarkClasses.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentatio
88
import java.math.BigInteger
99
import org.junit.jupiter.api.Assertions.assertEquals
1010
import org.junit.jupiter.api.Test
11+
import org.utbot.test.util.UtPair
12+
import java.io.File
1113

1214
class TestBenchmarkClasses {
1315
lateinit var utContext: AutoCloseable
@@ -16,15 +18,15 @@ class TestBenchmarkClasses {
1618
fun testRepeater() {
1719
ConcreteExecutor(
1820
CoverageInstrumentation,
19-
Repeater::class.java.protectionDomain.codeSource.location.path
21+
Repeater::class.java.protectionDomain.codeSource.location.path + File.pathSeparator + UtPair::class.java.protectionDomain.codeSource.location.path
2022
).use {
2123
val dc0 = Repeater(", ")
2224
val res0 = it.execute(Repeater::concat, arrayOf(dc0, "flex", "mega-", 2))
2325
assertEquals("mega-mega-flex", res0.getOrNull())
2426

2527

2628
val dc1 = Unzipper()
27-
val arr = arrayOf(Pair(1, 'h'), Pair(1, 'e'), Pair(2, 'l'), Pair(1, 'o'))
29+
val arr = arrayOf(UtPair(1, 'h'), UtPair(1, 'e'), UtPair(2, 'l'), UtPair(1, 'o'))
2830
val res1 = it.execute(Unzipper::unzip, arrayOf(dc1, arr))
2931
assertEquals("h-e-ll-o-", res1.getOrNull())
3032
}

‎utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/samples/ExampleClass.kt

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)