diff --git a/org.jacoco.core.test.validation.kotlin/pom.xml b/org.jacoco.core.test.validation.kotlin/pom.xml
index 0f3cae74a1..013a6ac504 100644
--- a/org.jacoco.core.test.validation.kotlin/pom.xml
+++ b/org.jacoco.core.test.validation.kotlin/pom.xml
@@ -25,11 +25,7 @@
JaCoCo :: Test :: Core :: Validation Kotlin
-
- 1.4.20
+ 1.5.0
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java
index d7e53732c0..1cba4a2c0a 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java
@@ -24,4 +24,10 @@ public KotlinDefaultMethodsTest() {
super(KotlinDefaultMethodsTarget.class);
}
+ @Override
+ public void all_missed_instructions_should_have_line_number() {
+ // instructions without line numbers
+ // corresponding to non-executed default implementations
+ }
+
}
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt
index 16e1f98e49..cc8825df3c 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt
@@ -47,7 +47,7 @@ object KotlinControlStructuresTarget {
private fun missedWhileBlock() {
- while (f()) { // assertPartlyCovered(1, 1)
+ while (f()) { // assertFullyCovered(1, 1)
nop() // assertNotCovered()
}
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt
index 13c55090bb..67abe0f9aa 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt
@@ -20,9 +20,9 @@ import org.jacoco.core.test.validation.targets.Stubs.nop
object KotlinDataClassTarget {
data class DataClass( // assertFullyCovered()
- val valNoRead: Int, // assertNotCovered()
+ val valNoRead: Int, // assertPartlyCovered()
val valRead: Int, // assertFullyCovered()
- var varNoReadNoWrite: Int, // assertNotCovered()
+ var varNoReadNoWrite: Int, // assertPartlyCovered()
var varNoWrite: Int, // assertPartlyCovered()
var varNoRead: Int, // assertPartlyCovered()
var varReadWrite: Int // assertFullyCovered()
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt
index 13f7e20d1e..09572d257c 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt
@@ -30,8 +30,8 @@ object KotlinWhenExpressionTarget {
@Suppress("REDUNDANT_ELSE_IN_WHEN")
private fun whenSealedRedundantElse(p: Sealed): Int = when (p) { // assertFullyCovered()
is Sealed.Sealed1 -> 1 // assertFullyCovered(0, 2)
- is Sealed.Sealed2 -> 2 // assertFullyCovered(1, 1)
- else -> throw NoWhenBranchMatchedException() // assertNotCovered()
+ is Sealed.Sealed2 -> 2 // assertFullyCovered(0, 0)
+ else -> throw NoWhenBranchMatchedException() // assertEmpty()
} // assertFullyCovered()
private enum class Enum {
@@ -44,10 +44,10 @@ object KotlinWhenExpressionTarget {
} // assertFullyCovered()
@Suppress("REDUNDANT_ELSE_IN_WHEN")
- private fun whenEnumRedundantElse(p: Enum): Int = when (p) { // assertFullyCovered(1, 2)
+ private fun whenEnumRedundantElse(p: Enum): Int = when (p) { // assertFullyCovered(0, 2)
Enum.A -> 1 // assertFullyCovered()
Enum.B -> 2 // assertFullyCovered()
- else -> throw NoWhenBranchMatchedException() // assertNotCovered()
+ else -> throw NoWhenBranchMatchedException() // assertEmpty()
} // assertFullyCovered()
private fun whenString(p: String): Int = when (p) { // assertFullyCovered(0, 7)
diff --git a/org.jacoco.core.test.validation/pom.xml b/org.jacoco.core.test.validation/pom.xml
index f8f081f3ca..6882afedda 100644
--- a/org.jacoco.core.test.validation/pom.xml
+++ b/org.jacoco.core.test.validation/pom.xml
@@ -32,7 +32,10 @@
true
- ${maven.compiler.target}
+
+
+ 1.6
+ 1.8
@@ -64,6 +67,9 @@
6
+
+ 1.6
+
../org.jacoco.core.test.validation.kotlin
@@ -90,6 +96,9 @@
7
+
+ 1.7
+
../org.jacoco.core.test.validation.kotlin
../org.jacoco.core.test.validation.java7
@@ -111,9 +120,22 @@
- java8-bytecode
+ default
true
+
+
+ ../org.jacoco.core.test.validation.kotlin
+ ../org.jacoco.core.test.validation.java7
+ ../org.jacoco.core.test.validation.java8
+ ../org.jacoco.core.test.validation.groovy
+ ../org.jacoco.core.test.validation.scala
+
+
+
+
+ java8-bytecode
+
bytecode.version
8
@@ -132,6 +154,26 @@
+
+ java9-bytecode
+
+
+ bytecode.version
+ 9
+
+
+
+ 9
+ 9
+
+
+ ../org.jacoco.core.test.validation.kotlin
+ ../org.jacoco.core.test.validation.java7
+ ../org.jacoco.core.test.validation.java8
+ ../org.jacoco.core.test.validation.groovy
+
+
+
java10-bytecode
@@ -141,7 +183,8 @@
- 1.8
+ 10
+ 10
../org.jacoco.core.test.validation.kotlin
@@ -160,7 +203,8 @@
- 1.8
+ 11
+ 11
../org.jacoco.core.test.validation.kotlin
@@ -180,7 +224,8 @@
- 1.8
+ 12
+ 12
../org.jacoco.core.test.validation.kotlin
@@ -200,6 +245,8 @@
+ 14
+ 14
14
14
@@ -223,6 +270,8 @@
+ 15
+ 15
15
15
@@ -246,17 +295,14 @@
+ 16
+ 16
16
16
-
../org.jacoco.core.test.validation.java7
../org.jacoco.core.test.validation.java8
../org.jacoco.core.test.validation.java14
@@ -274,17 +320,14 @@
+ 17
+ 17
17
17
-
../org.jacoco.core.test.validation.java7
../org.jacoco.core.test.validation.java8
../org.jacoco.core.test.validation.java14
diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index 938a047b9c..5cd0aef3f8 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -165,11 +165,11 @@ Compilation and testing with different JDKs
6 |
6 |
6 |
- 7 |
- 7 |
- 7 |
- 7 |
- 7 |
+ 6 |
+ 6 |
+ 6 |
+ 6 |
+ 6 |
all other modules |