diff options
| author | Evgeny Mandrikov <Godin@users.noreply.github.com> | 2018-12-14 17:56:18 +0100 |
|---|---|---|
| committer | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2018-12-14 17:56:18 +0100 |
| commit | 9ad5e6ca90822fc0f99fc2c1600d41d38ec69e47 (patch) | |
| tree | 762cb8af78a8bfe8576b57002fb269a0a1c10b9e /org.jacoco.core.test.validation.kotlin | |
| parent | 529be6db01c2cc606bb4b4cdc2088cf0df724961 (diff) | |
| download | jacoco-9ad5e6ca90822fc0f99fc2c1600d41d38ec69e47.tar.gz | |
Fix filtering in case of inlining top level function into class in same file (#798)
Diffstat (limited to 'org.jacoco.core.test.validation.kotlin')
2 files changed, 12 insertions, 2 deletions
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinInlineTest.java b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinInlineTest.java index 0134d0d0..5d6fab7e 100644 --- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinInlineTest.java +++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinInlineTest.java @@ -12,7 +12,7 @@ package org.jacoco.core.test.validation.kotlin; import org.jacoco.core.test.validation.ValidationTestBase; -import org.jacoco.core.test.validation.kotlin.targets.KotlinInlineTarget; +import org.jacoco.core.test.validation.kotlin.targets.KotlinInlineTargetKt; /** * Test of <code>inline</code> functions. @@ -20,7 +20,7 @@ import org.jacoco.core.test.validation.kotlin.targets.KotlinInlineTarget; public class KotlinInlineTest extends ValidationTestBase { public KotlinInlineTest() { - super(KotlinInlineTarget.class); + super(KotlinInlineTargetKt.class); } } diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinInlineTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinInlineTarget.kt index e1a8c425..f65045a4 100644 --- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinInlineTarget.kt +++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinInlineTarget.kt @@ -17,6 +17,14 @@ import org.jacoco.core.test.validation.targets.Stubs.t /** * Test target for `inline` functions. */ +fun main(args: Array<String>) { + KotlinInlineTarget.main(args) +} + +inline fun inlined_top_level() { + nop() // assertNotCovered() +} + object KotlinInlineTarget { inline fun inlined() { @@ -26,6 +34,8 @@ object KotlinInlineTarget { @JvmStatic fun main(args: Array<String>) { + inlined_top_level() // assertFullyCovered() + inlined() // assertFullyCovered() /* Following inlined method for some reasons doesn't appear in SMAP: */ |