Added tests on try-finally and try-with-resources

Resolves #628

PR #639

Author: shanshin

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-intellij-coverage = "1.0.755"
+intellij-coverage = "1.0.760"
 junit = "5.9.0"
 kotlinx-bcv = "0.13.2"
 kotlinx-dokka = "1.8.10"

kover-gradle-plugin/api/kover-gradle-plugin.api

@@ -297,7 +297,6 @@ public abstract interface class kotlinx/kover/gradle/plugin/dsl/KoverVerifyTaskC
 public final class kotlinx/kover/gradle/plugin/dsl/KoverVersions {
 	public static final field INSTANCE Lkotlinx/kover/gradle/plugin/dsl/KoverVersions;
 	public static final field JACOCO_TOOL_DEFAULT_VERSION Ljava/lang/String;
-	public static final field KOVER_TOOL_VERSION Ljava/lang/String;
 	public static final field MINIMUM_GRADLE_VERSION Ljava/lang/String;
 	public final fun getVersion ()Ljava/lang/String;
 }

kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/CountersValueTests.kt

@@ -34,6 +34,12 @@ internal class CountersValueTests {
 
             // Instruction counters - value may depend on Kotlin compiler version
             methodCounter("org.jetbrains.Different", "helloWorld").assertTotal(4)
+
+            // Test on try with resources in Java
+            methodCounter("org.jetbrains.TryWithResources", "test", "LINE").assertFullyCovered()
+            methodCounter("org.jetbrains.TryWithResources", "test", "BRANCH").assertFullyCovered()
+
+            methodCounter("org.jetbrains.TryFinally", "testWithCatch", "LINE").assertCovered(2, 1)
         }
     }
 

kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/checker/Checker.kt

@@ -512,6 +512,10 @@ private class CounterImpl(
 
     override fun assertFullyCovered() {
         assertNotNull(values, "Counter '$symbol' with type '$type' is absent so fully covered can't be checked")
+
+        // skip empty branches
+        if (values.covered == 0 && values.missed == 0) return
+
         assertTrue(values.covered > 0, "Counter '$symbol' with type '$type' isn't fully covered")
         assertEquals(0, values.missed, "Counter '$symbol' with type '$type' isn't fully covered")
     }

kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/java/TryFinally.java

@@ -0,0 +1,16 @@
+package org.jetbrains;
+
+public final class TryFinally {
+
+    private TryFinally() {}
+
+    public static void testWithCatch(Runnable runnable) {
+        try {
+            runnable.run(); // covered
+        } catch (RuntimeException e) {
+            System.out.println("Error"); // missed
+        } finally {
+            System.out.println("Finally"); // covered
+        }
+    }
+}

kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/java/TryWithResources.java

@@ -0,0 +1,16 @@
+package org.jetbrains;
+
+public final class TryWithResources {
+
+    private TryWithResources() {}
+
+    public static void test() throws Exception {
+        try (AutoCloseable ignored = generate()) {
+            System.out.println("action");
+        }
+    }
+
+    private static AutoCloseable generate() {
+        return () -> System.out.println("closed");
+    }
+}

kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/test/kotlin/TestClass.kt

@@ -24,4 +24,13 @@ class TestClass {
         UsedObjectWithFun.toString()
         UsedObjectFun.hello()
     }
+
+    @Test
+    fun testTryWithResources() {
+        TryWithResources.test()
+    }
+    @Test
+    fun testTryFinally() {
+        TryFinally.testWithCatch {}
+    }
 }

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverVersions.kt

@@ -14,11 +14,6 @@ public object KoverVersions {
      */
     public const val MINIMUM_GRADLE_VERSION = "6.8"
 
-    /**
-     * Kover coverage tool version.
-     */
-    public const val KOVER_TOOL_VERSION = "1.0.755"
-
     /**
      * JaCoCo coverage tool version used by default.
      */

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/CoverageTool.kt

@@ -4,11 +4,11 @@
 
 package kotlinx.kover.gradle.plugin.tools
 
+import kotlinx.kover.features.jvm.KoverFeatures
 import kotlinx.kover.features.jvm.RuleViolations
 import kotlinx.kover.gradle.plugin.commons.*
 import kotlinx.kover.gradle.plugin.commons.VerificationRule
 import kotlinx.kover.gradle.plugin.dsl.*
-import kotlinx.kover.gradle.plugin.dsl.KoverVersions.KOVER_TOOL_VERSION
 import kotlinx.kover.gradle.plugin.dsl.internal.KoverProjectExtensionImpl
 import kotlinx.kover.gradle.plugin.tools.jacoco.JacocoTool
 import kotlinx.kover.gradle.plugin.tools.kover.KoverTool
@@ -48,7 +48,7 @@ internal sealed class CoverageToolVariant(
 }
 
 internal class KoverToolVariant(version: String): CoverageToolVariant(CoverageToolVendor.KOVER, version)
-internal object KoverToolBuiltin: CoverageToolVariant(CoverageToolVendor.KOVER, KOVER_TOOL_VERSION)
+internal object KoverToolBuiltin: CoverageToolVariant(CoverageToolVendor.KOVER, KoverFeatures.version)
 
 internal class JacocoToolVariant(version: String): CoverageToolVariant(CoverageToolVendor.JACOCO, version)