Merge branch 'pr/247' into devel

szpak · Mar 4, 2021 · 39956b0 · 39956b0
2 parents 447eee3 + 9e87a17
commit 39956b0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.6.0 - Unreleased
 
  - **Report aggregation for multi-project builds** - [#243](https://github.com/szpak/gradle-pitest-plugin/pull/243) - PR by [Mike Safonov](https://github.com/MikeSafonov)
+ - Support new configuration property `testStrengthThreshold` (PIT 1.6.1+) - [#247](https://github.com/szpak/gradle-pitest-plugin/pull/247) - PR by [Michael Hönnig](https://github.com/mhoennig)
  - PIT 1.6.3 by default
  - Regression tests also with Gradle 7 (milestone)
  - Upgrade Gradle wrapper to 6.8.3

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ The Pitest plugin does not need to be additionally configured if you use JUnit 4
 ```groovy
 pitest {
     targetClasses = ['our.base.package.*']  //by default "${project.group}.*"
-    pitestVersion = '1.5.1' //not needed when a default PIT version should be used
+    pitestVersion = '1.5.2' //not needed when a default PIT version should be used
     threads = 4
     outputFormats = ['XML', 'HTML']
     timestampedReports = false

diff --git a/src/main/groovy/info/solidsoft/gradle/pitest/PitestPlugin.groovy b/src/main/groovy/info/solidsoft/gradle/pitest/PitestPlugin.groovy
@@ -189,6 +189,7 @@ class PitestPlugin implements Plugin<Project> {
         //defaultFileForHistoryData - separate method
         task.mutationThreshold.set(extension.mutationThreshold)
         task.coverageThreshold.set(extension.coverageThreshold)
+        task.testStrengthThreshold.set(extension.testStrengthThreshold)
         task.mutationEngine.set(extension.mutationEngine)
         task.exportLineCoverage.set(extension.exportLineCoverage)
         task.jvmPath.set(extension.jvmPath)

diff --git a/src/main/groovy/info/solidsoft/gradle/pitest/PitestPluginExtension.groovy b/src/main/groovy/info/solidsoft/gradle/pitest/PitestPluginExtension.groovy
@@ -147,6 +147,7 @@ class PitestPluginExtension {
     final Property<Boolean> enableDefaultIncrementalAnalysis    //specific for Gradle plugin
     final Property<Integer> mutationThreshold
     final Property<Integer> coverageThreshold
+    final Property<Integer> testStrengthThreshold
     final Property<String> mutationEngine
     final Property<Boolean> exportLineCoverage  //for debugging usage only
     final RegularFileProperty jvmPath
@@ -251,6 +252,7 @@ class PitestPluginExtension {
         enableDefaultIncrementalAnalysis = of.property(Boolean)
         mutationThreshold = of.property(Integer)
         coverageThreshold = of.property(Integer)
+        testStrengthThreshold = of.property(Integer)
         mutationEngine = of.property(String)
         exportLineCoverage = of.property(Boolean)
         jvmPath = of.fileProperty()

diff --git a/src/main/groovy/info/solidsoft/gradle/pitest/PitestTask.groovy b/src/main/groovy/info/solidsoft/gradle/pitest/PitestTask.groovy
@@ -189,6 +189,10 @@ class PitestTask extends JavaExec {
     @Optional
     final Property<Integer> coverageThreshold
 
+    @Input
+    @Optional
+    final Property<Integer> testStrengthThreshold
+
     @Input
     @Optional
     final Property<String> mutationEngine
@@ -276,6 +280,7 @@ class PitestTask extends JavaExec {
         defaultFileForHistoryData = of.fileProperty()
         mutationThreshold = of.property(Integer)
         coverageThreshold = of.property(Integer)
+        testStrengthThreshold = of.property(Integer)
         mutationEngine = of.property(String)
         exportLineCoverage = of.property(Boolean)
         jvmPath = of.fileProperty()
@@ -361,6 +366,7 @@ class PitestTask extends JavaExec {
         map['mutableCodePaths'] = (getMutableCodePaths()*.absolutePath)?.join(',')
         map['mutationThreshold'] = optionalPropertyAsString(mutationThreshold)
         map['coverageThreshold'] = optionalPropertyAsString(coverageThreshold)
+        map['testStrengthThreshold'] = optionalPropertyAsString(testStrengthThreshold)
         map['mutationEngine'] = mutationEngine.getOrNull()
         map['exportLineCoverage'] = optionalPropertyAsString(exportLineCoverage)
         map['includeLaunchClasspath'] = Boolean.FALSE.toString()   //code to analyse is passed via classPath

diff --git a/src/test/groovy/info/solidsoft/gradle/pitest/PitestTaskConfigurationSpec.groovy b/src/test/groovy/info/solidsoft/gradle/pitest/PitestTaskConfigurationSpec.groovy
@@ -49,6 +49,7 @@ class PitestTaskConfigurationSpec extends BasicProjectBuilderSpec implements Wit
                                                                                 'timestampedReports',
                                                                                 'mutationThreshold',
                                                                                 'coverageThreshold',
+                                                                                'testStrengthThreshold',
                                                                                 'mutationEngine',
                                                                                 'exportLineCoverage',
                                                                                 'jvmPath',
@@ -160,6 +161,7 @@ class PitestTaskConfigurationSpec extends BasicProjectBuilderSpec implements Wit
             //enableDefaultIncrementalAnalysis tested separately
             "mutationThreshold"      | 90                                           || "90"
             "coverageThreshold"      | 95                                           || "95"
+            "testStrengthThreshold"  | 95                                           || "95"
             "mutationEngine"         | "gregor2"                                    || "gregor2"
             "exportLineCoverage"     | true                                         || "true"
             "jvmPath"                | new File("//opt//jvm15//")                   || new File("//opt//jvm15//").path