Skip to content

Commit 5afee97

Browse files
committed
JaCoCo can be run with test goal
1 parent d922792 commit 5afee97

File tree

3 files changed

+44
-14
lines changed

3 files changed

+44
-14
lines changed

utbot-fuzzing/src/main/kotlin/org/utbot/fuzzing/Configuration.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,9 @@ data class Configuration(
9090
* to generate a recursive object, but will use [Seed.Recursive.empty] instead.
9191
*/
9292
var generateEmptyRecursiveForMissedTypes: Boolean = true,
93+
94+
/**
95+
* Limits maximum number of recursive seed modifications
96+
*/
97+
var maxNumberOfRecursiveSeedModifications: Int = 10,
9398
)

utbot-junit-contest/build.gradle

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,30 @@ compileJava {
1313

1414
compileTestJava {
1515
options.fork = true
16-
options.forkOptions.executable = 'javac'
1716
options.compilerArgs << "-XDignore.symbol.file"
1817
}
1918

19+
def testProjects = [
20+
'build/output/test/antlr',
21+
'build/output/test/codeforces',
22+
'build/output/test/fastjson-1.2.50',
23+
'build/output/test/fescar',
24+
'build/output/test/guava',
25+
'build/output/test/guava-26.0',
26+
'build/output/test/guava-30.0',
27+
'build/output/test/pdfbox',
28+
'build/output/test/seata',
29+
'build/output/test/seata-core-0.5.0',
30+
'build/output/test/spoon',
31+
'build/output/test/spoon-core-7.0.0',
32+
]
33+
2034
sourceSets {
2135
test {
2236
java {
23-
srcDir('build/output/test/antlr')
24-
srcDir('build/output/test/custom')
25-
srcDir('build/output/test/guava')
26-
srcDir('build/output/test/fescar')
27-
srcDir('build/output/test/pdfbox')
28-
srcDir('build/output/test/seata')
29-
srcDir('build/output/test/spoon')
30-
srcDir('build/output/test/samples')
31-
srcDir('build/output/test/utbottest')
37+
testProjects.forEach {
38+
srcDir(it)
39+
}
3240
}
3341
}
3442
}
@@ -39,7 +47,26 @@ test {
3947
}
4048

4149
jacocoTestReport {
50+
afterEvaluate {
51+
def r = testProjects.collect {
52+
fileTree(dir: it)
53+
}.findAll {
54+
it.dir.exists()
55+
}
56+
sourceDirectories.setFrom(r.collect {files(it) })
57+
classDirectories.setFrom(
58+
r.collect {
59+
fileTree(dir: it.dir.toPath().parent.resolveSibling("unzipped").resolve(it.dir.name))
60+
}.findAll {
61+
it.dir.exists()
62+
}.collect {
63+
files(it)
64+
}
65+
)
66+
}
67+
4268
reports {
69+
csv.enabled = true
4370
html.enabled = true
4471
}
4572
}

utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import org.utbot.common.isAbstract
1010
import org.utbot.engine.EngineController
1111
import org.utbot.framework.TestSelectionStrategyType
1212
import org.utbot.framework.UtSettings
13-
import org.utbot.framework.codegen.domain.ForceStaticMocking
14-
import org.utbot.framework.codegen.domain.StaticsMocking
15-
import org.utbot.framework.codegen.domain.junitByVersion
1613
import org.utbot.framework.plugin.api.util.UtContext
1714
import org.utbot.framework.plugin.api.util.executableId
1815
import org.utbot.framework.plugin.api.util.id
@@ -51,7 +48,7 @@ import kotlinx.coroutines.newSingleThreadContext
5148
import kotlinx.coroutines.runBlocking
5249
import kotlinx.coroutines.withTimeoutOrNull
5350
import org.utbot.framework.SummariesGenerationType
54-
import org.utbot.framework.codegen.domain.ProjectType
51+
import org.utbot.framework.codegen.domain.*
5552
import org.utbot.framework.codegen.generator.CodeGenerator
5653
import org.utbot.framework.codegen.services.language.CgLanguageAssistant
5754
import org.utbot.framework.minimization.minimizeExecutions
@@ -228,6 +225,7 @@ fun runGeneration(
228225
forceStaticMocking = forceStaticMocking,
229226
generateWarningsForStaticMocking = false,
230227
cgLanguageAssistant = CgLanguageAssistant.getByCodegenLanguage(CodegenLanguage.defaultItem),
228+
runtimeExceptionTestsBehaviour = RuntimeExceptionTestsBehaviour.PASS,
231229
)
232230

233231
logger.info().measureTime({ "class ${cut.fqn}" }, { statsForClass }) {

0 commit comments

Comments
 (0)