Skip to content

Commit 07b659b

Browse files
DamtevDamtev
committed
Fixed rebase errors
1 parent 763ffc9 commit 07b659b

5 files changed

Lines changed: 41 additions & 31 deletions

File tree

‎utbot-framework-api/src/main/kotlin/org/utbot/testcheckers/SettingsModificators.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,13 @@ inline fun <reified T> withoutSandbox(block: () -> T): T {
121121
UtSettings.disableSandbox = prev
122122
}
123123
}
124+
125+
inline fun <reified T> withPathSelectorStepsLimit(stepsLimit: Int, block: () -> T): T {
126+
val prev = UtSettings.pathSelectorStepsLimit
127+
UtSettings.pathSelectorStepsLimit = stepsLimit
128+
try {
129+
return block()
130+
} finally {
131+
UtSettings.pathSelectorStepsLimit = prev
132+
}
133+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.utbot.examples.stream
33
import org.junit.jupiter.api.Disabled
44
import org.junit.jupiter.api.Tag
55
import org.junit.jupiter.api.Test
6-
import org.utbot.examples.AtLeast
76
import org.utbot.tests.infrastructure.UtValueTestCaseChecker
87
import org.utbot.tests.infrastructure.DoNotCalculate
98
import org.utbot.tests.infrastructure.Full
@@ -14,6 +13,7 @@ import org.utbot.tests.infrastructure.isException
1413
import org.utbot.framework.plugin.api.CodegenLanguage
1514
import org.utbot.testcheckers.eq
1615
import org.utbot.testcheckers.withoutConcrete
16+
import org.utbot.tests.infrastructure.AtLeast
1717
import org.utbot.tests.infrastructure.CodeGeneration
1818
import java.util.Optional
1919
import java.util.stream.Stream

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ package org.utbot.examples.stream
33
import org.junit.jupiter.api.Disabled
44
import org.junit.jupiter.api.Tag
55
import org.junit.jupiter.api.Test
6-
import org.utbot.examples.AtLeast
7-
import org.utbot.examples.UtValueTestCaseChecker
8-
import org.utbot.examples.Full
9-
import org.utbot.examples.FullWithAssumptions
10-
import org.utbot.examples.eq
11-
import org.utbot.examples.ignoreExecutionsNumber
12-
import org.utbot.examples.isException
13-
import org.utbot.examples.withPathSelectorStepsLimit
14-
import org.utbot.examples.withoutConcrete
15-
import org.utbot.framework.codegen.CodeGeneration
166
import org.utbot.framework.plugin.api.CodegenLanguage
7+
import org.utbot.testcheckers.eq
8+
import org.utbot.testcheckers.withPathSelectorStepsLimit
9+
import org.utbot.testcheckers.withoutConcrete
10+
import org.utbot.tests.infrastructure.AtLeast
11+
import org.utbot.tests.infrastructure.CodeGeneration
12+
import org.utbot.tests.infrastructure.Full
13+
import org.utbot.tests.infrastructure.FullWithAssumptions
14+
import org.utbot.tests.infrastructure.UtValueTestCaseChecker
15+
import org.utbot.tests.infrastructure.ignoreExecutionsNumber
16+
import org.utbot.tests.infrastructure.isException
1717
import java.util.OptionalDouble
1818
import java.util.stream.DoubleStream
1919
import kotlin.streams.toList

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ package org.utbot.examples.stream
33
import org.junit.jupiter.api.Disabled
44
import org.junit.jupiter.api.Tag
55
import org.junit.jupiter.api.Test
6-
import org.utbot.examples.AtLeast
7-
import org.utbot.examples.UtValueTestCaseChecker
8-
import org.utbot.examples.Full
9-
import org.utbot.examples.FullWithAssumptions
10-
import org.utbot.examples.eq
11-
import org.utbot.examples.ignoreExecutionsNumber
12-
import org.utbot.examples.isException
13-
import org.utbot.examples.withPathSelectorStepsLimit
14-
import org.utbot.examples.withoutConcrete
15-
import org.utbot.framework.codegen.CodeGeneration
166
import org.utbot.framework.plugin.api.CodegenLanguage
7+
import org.utbot.testcheckers.eq
8+
import org.utbot.testcheckers.withPathSelectorStepsLimit
9+
import org.utbot.testcheckers.withoutConcrete
10+
import org.utbot.tests.infrastructure.AtLeast
11+
import org.utbot.tests.infrastructure.CodeGeneration
12+
import org.utbot.tests.infrastructure.Full
13+
import org.utbot.tests.infrastructure.FullWithAssumptions
14+
import org.utbot.tests.infrastructure.UtValueTestCaseChecker
15+
import org.utbot.tests.infrastructure.ignoreExecutionsNumber
16+
import org.utbot.tests.infrastructure.isException
1717
import java.util.OptionalDouble
1818
import java.util.OptionalInt
1919
import java.util.stream.IntStream

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ package org.utbot.examples.stream
33
import org.junit.jupiter.api.Disabled
44
import org.junit.jupiter.api.Tag
55
import org.junit.jupiter.api.Test
6-
import org.utbot.examples.AtLeast
7-
import org.utbot.examples.UtValueTestCaseChecker
8-
import org.utbot.examples.Full
9-
import org.utbot.examples.FullWithAssumptions
10-
import org.utbot.examples.eq
11-
import org.utbot.examples.ignoreExecutionsNumber
12-
import org.utbot.examples.isException
13-
import org.utbot.examples.withPathSelectorStepsLimit
14-
import org.utbot.examples.withoutConcrete
15-
import org.utbot.framework.codegen.CodeGeneration
166
import org.utbot.framework.plugin.api.CodegenLanguage
7+
import org.utbot.testcheckers.eq
8+
import org.utbot.testcheckers.withPathSelectorStepsLimit
9+
import org.utbot.testcheckers.withoutConcrete
10+
import org.utbot.tests.infrastructure.AtLeast
11+
import org.utbot.tests.infrastructure.CodeGeneration
12+
import org.utbot.tests.infrastructure.Full
13+
import org.utbot.tests.infrastructure.FullWithAssumptions
14+
import org.utbot.tests.infrastructure.UtValueTestCaseChecker
15+
import org.utbot.tests.infrastructure.ignoreExecutionsNumber
16+
import org.utbot.tests.infrastructure.isException
1717
import java.util.OptionalDouble
1818
import java.util.OptionalLong
1919
import java.util.stream.LongStream

0 commit comments

Comments
 (0)