UnitTestBot · egiptipavel · Aug 3, 2023 · Aug 3, 2023 · Aug 4, 2023 · Aug 5, 2023
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt
@@ -480,6 +480,11 @@ object UtSettings : AbstractSettings(logger, defaultKeyForSettingsPath, defaultS
      */
     var useBytecodeTransformation by getBooleanProperty(false)
 
+    /**
+     * Type of trace instrumentation.
+     */
+    var traceInstrumentationType by getEnumProperty(TraceInstrumentationType.INSTRUCTION)
+
     /**
      * Limit for number of generated tests per method (in each region)
      */
@@ -756,3 +761,16 @@ enum class ExploreThrowableDepth {
      */
     EXPLORE_ALL_STATEMENTS
 }
+
+enum class TraceInstrumentationType {
+
+    /**
+     * Insert probes before each bytecode instruction.
+     */
+    INSTRUCTION,
+
+    /**
+     * Insert probes into the [control flow graph](https://www.eclemma.org/jacoco/trunk/doc/flow.html).
+     */
+    BRANCH
+}
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/coverage/CoverageCalculator.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/coverage/CoverageCalculator.kt
@@ -1,19 +1,19 @@
 package org.utbot.framework.coverage
 
+import kotlinx.coroutines.runBlocking
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.UtValueExecution
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.instrumentation.ConcreteExecutor
 import org.utbot.instrumentation.instrumentation.coverage.CoverageInfo
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
 import org.utbot.instrumentation.util.StaticEnvironment
-import kotlinx.coroutines.runBlocking
 
 fun methodCoverage(executable: ExecutableId, executions: List<UtValueExecution<*>>, classpath: String): Coverage {
     val methodSignature = executable.signature
     val classId = executable.classId
-    return ConcreteExecutor(CoverageInstrumentation.Factory, classpath).let { executor ->
+    return ConcreteExecutor(InstructionCoverageInstrumentation.Factory, classpath).let { executor ->
         for (execution in executions) {
             val args = execution.stateBefore.params.map { it.value }.toMutableList()
             val caller = execution.stateBefore.caller

diff --git a/...rumentation-tests/src/test/kotlin/org/utbot/examples/TestBranchCoverageInstrumentation.kt b/...rumentation-tests/src/test/kotlin/org/utbot/examples/TestBranchCoverageInstrumentation.kt
@@ -0,0 +1,93 @@
+package org.utbot.examples
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.utbot.examples.samples.ExampleClass
+import org.utbot.examples.samples.et.ClassSimpleCatch
+import org.utbot.examples.statics.substitution.StaticSubstitution
+import org.utbot.examples.statics.substitution.StaticSubstitutionExamples
+import org.utbot.framework.plugin.api.util.fieldId
+import org.utbot.framework.plugin.api.util.signature
+import org.utbot.instrumentation.execute
+import org.utbot.instrumentation.instrumentation.coverage.BranchCoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
+import org.utbot.instrumentation.util.StaticEnvironment
+import org.utbot.instrumentation.withInstrumentation
+
+class TestBranchCoverageInstrumentation {
+    lateinit var utContext: AutoCloseable
+
+    @Test
+    fun testIfBranches() {
+        withInstrumentation(
+            BranchCoverageInstrumentation.Factory,
+            ExampleClass::class.java.protectionDomain.codeSource.location.path
+        ) { executor ->
+            val testObject = ExampleClass()
+
+            executor.execute(ExampleClass::bar, arrayOf(testObject, 2))
+            val coverageInfo1 = executor.collectCoverage(ExampleClass::class.java)
+
+            assertEquals(2, coverageInfo1.visitedInstrs.size)
+            assertEquals(1..3, coverageInfo1.methodToInstrRange[ExampleClass::bar.signature])
+
+            executor.execute(ExampleClass::bar, arrayOf(testObject, 0))
+            val coverageInfo2 = executor.collectCoverage(ExampleClass::class.java)
+
+            assertEquals(2, coverageInfo2.visitedInstrs.size)
+            assertEquals(1..3, coverageInfo2.methodToInstrRange[ExampleClass::bar.signature])
+        }
+    }
+
+    @Test
+    fun testTryCatch() {
+        withInstrumentation(
+            BranchCoverageInstrumentation.Factory,
+            ClassSimpleCatch::class.java.protectionDomain.codeSource.location.path
+        ) { executor ->
+            executor.execute(ClassSimpleCatch::A_catches, emptyArray())
+            val coverageInfo1 = executor.collectCoverage(ClassSimpleCatch::class.java)
+
+            assertEquals(2, coverageInfo1.visitedInstrs.size)
+            assertEquals(3..5, coverageInfo1.methodToInstrRange[ClassSimpleCatch::A_catches.signature])
+
+            executor.execute(ClassSimpleCatch::A_catchesWrongException, emptyArray())
+            val coverageInfo2 = executor.collectCoverage(ClassSimpleCatch::class.java)
+
+            assertEquals(0, coverageInfo2.visitedInstrs.size)
+            assertEquals(7..9, coverageInfo2.methodToInstrRange[ClassSimpleCatch::A_catchesWrongException.signature])
+        }
+    }
+
+    @Test
+    fun testTernaryOperator() {
+        withInstrumentation(
+            BranchCoverageInstrumentation.Factory,
+            StaticSubstitutionExamples::class.java.protectionDomain.codeSource.location.path
+        ) { executor ->
+            val testObject = StaticSubstitutionExamples()
+
+            val emptyStaticEnvironment = StaticEnvironment()
+
+            val res1 = executor.execute(
+                StaticSubstitutionExamples::lessThanZero,
+                arrayOf(testObject),
+                parameters = emptyStaticEnvironment
+            )
+
+            val staticEnvironment = StaticEnvironment(
+                StaticSubstitution::mutableValue.fieldId to -1
+            )
+            val res2 = executor.execute(
+                StaticSubstitutionExamples::lessThanZero,
+                arrayOf(testObject),
+                parameters = staticEnvironment
+            )
+            val coverageInfo = executor.collectCoverage(StaticSubstitutionExamples::class.java)
+
+            assertEquals(res1.getOrNull(), 5)
+            assertEquals(res2.getOrNull(), 0)
+            assertEquals(coverageInfo.visitedInstrs, (1..3).toList())
+        }
+    }
+}
diff --git a/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestConstructors.kt b/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestConstructors.kt
@@ -6,7 +6,7 @@ import org.utbot.framework.plugin.api.util.signature
 import org.utbot.instrumentation.ConcreteExecutor
 import org.utbot.instrumentation.execute
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
 import org.utbot.instrumentation.instrumentation.et.ExecutionTraceInstrumentation
 import org.utbot.instrumentation.instrumentation.et.convert
@@ -86,7 +86,7 @@ class TestConstructors {
     @Test
     fun testCoverageConstructor() {
         withInstrumentation(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             CLASSPATH
         ) { executor ->
             val constructors = ClassWithMultipleConstructors::class.constructors

diff --git a/...t/examples/TestCoverageInstrumentation.kt → ...TestInstructionCoverageInstrumentation.kt b/...t/examples/TestCoverageInstrumentation.kt → ...TestInstructionCoverageInstrumentation.kt
@@ -8,7 +8,7 @@ import org.utbot.framework.plugin.api.util.fieldId
 import org.utbot.framework.plugin.api.util.signature
 import org.utbot.instrumentation.ConcreteExecutor
 import org.utbot.instrumentation.execute
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
 import org.utbot.instrumentation.util.InstrumentedProcessError
 import org.utbot.instrumentation.util.StaticEnvironment
@@ -18,13 +18,13 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 
-class TestCoverageInstrumentation {
+class TestInstructionCoverageInstrumentation {
     lateinit var utContext: AutoCloseable
 
     @Test
     fun testCatchTargetException() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = ExampleClass()
@@ -41,7 +41,7 @@ class TestCoverageInstrumentation {
     @Test
     fun testIfBranches() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = ExampleClass()
@@ -63,7 +63,7 @@ class TestCoverageInstrumentation {
     @Test
     fun testWrongArgumentsException() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = ExampleClass()
@@ -86,7 +86,7 @@ class TestCoverageInstrumentation {
     @Test
     fun testMultipleRunsInsideCoverage() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = ExampleClass()
@@ -121,7 +121,7 @@ class TestCoverageInstrumentation {
     @Test
     fun testSameResult() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = ExampleClass()
@@ -143,7 +143,7 @@ class TestCoverageInstrumentation {
     @Test
     fun testResult() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = ExampleClass()
@@ -160,7 +160,7 @@ class TestCoverageInstrumentation {
     @Test
     fun testEmptyMethod() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = ExampleClass()
@@ -176,7 +176,7 @@ class TestCoverageInstrumentation {
     @Test
     fun testTernaryOperator() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             StaticSubstitutionExamples::class.java.protectionDomain.codeSource.location.path
         ).use {
             val testObject = StaticSubstitutionExamples()

diff --git a/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestStaticMethods.kt b/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestStaticMethods.kt
@@ -4,7 +4,7 @@ import org.utbot.examples.samples.staticenvironment.StaticExampleClass
 import org.utbot.framework.plugin.api.util.signature
 import org.utbot.instrumentation.ConcreteExecutor
 import org.utbot.instrumentation.execute
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
@@ -17,7 +17,7 @@ class TestStaticMethods {
     @Test
     fun testStaticMethodCall() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             StaticExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val res1 = it.execute(StaticExampleClass::inc, arrayOf())
@@ -44,7 +44,7 @@ class TestStaticMethods {
     @Test
     fun testNullableMethod() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             StaticExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val res1 = it.execute(
@@ -75,7 +75,7 @@ class TestStaticMethods {
     @Test
     fun testNullableMethodWithoutAnnotations() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             StaticExampleClass::class.java.protectionDomain.codeSource.location.path
         ).use {
             val res1 = it.execute(

diff --git a/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestWithInstrumentation.kt b/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestWithInstrumentation.kt
@@ -6,7 +6,7 @@ import org.utbot.examples.samples.staticenvironment.StaticExampleClass
 import org.utbot.framework.plugin.api.util.signature
 import org.utbot.instrumentation.execute
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
 import org.utbot.instrumentation.withInstrumentation
 import kotlin.reflect.full.declaredMembers
@@ -20,7 +20,7 @@ class TestWithInstrumentation {
     @Test
     fun testStaticMethodCall() {
         withInstrumentation(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             StaticExampleClass::class.java.protectionDomain.codeSource.location.path
         ) { executor ->
             val res1 = executor.execute(StaticExampleClass::inc, arrayOf())
@@ -70,7 +70,7 @@ class TestWithInstrumentation {
     @Test
     fun testInnerClasses() {
         withInstrumentation(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             ClassWithInnerClasses::class.java.protectionDomain.codeSource.location.path
         ) { executor ->
             val innerClazz = ClassWithInnerClasses.InnerClass::class.java

diff --git a/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/Benchmark.kt b/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/Benchmark.kt
@@ -2,7 +2,7 @@ package org.utbot.examples.benchmark
 
 import org.utbot.instrumentation.ConcreteExecutor
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
 import org.utbot.instrumentation.util.Isolated
 import kotlin.system.measureNanoTime
@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
 fun getBasicCoverageTime(count: Int): Double {
     var time: Long
     ConcreteExecutor(
-        CoverageInstrumentation.Factory,
+        InstructionCoverageInstrumentation.Factory,
         Repeater::class.java.protectionDomain.codeSource.location.path
     ).use { executor ->
         val dc0 = Repeater(", ")

diff --git a/...-instrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/BenchmarkFibonacci.kt b/...-instrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/BenchmarkFibonacci.kt
@@ -5,15 +5,15 @@ import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.withUtContext
 import org.utbot.instrumentation.ConcreteExecutor
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import org.utbot.instrumentation.instrumentation.coverage.collectCoverage
 import org.utbot.instrumentation.util.Isolated
 import kotlin.system.measureNanoTime
 
 fun getBasicCoverageTime_fib(count: Int): Double {
     var time: Long
     ConcreteExecutor(
-        CoverageInstrumentation.Factory,
+        InstructionCoverageInstrumentation.Factory,
         Fibonacci::class.java.protectionDomain.codeSource.location.path
     ).use {
         val fib = Isolated(Fibonacci::calc, it)

diff --git a/...nstrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/TestBenchmarkClasses.kt b/...nstrumentation-tests/src/test/kotlin/org/utbot/examples/benchmark/TestBenchmarkClasses.kt
@@ -4,7 +4,7 @@ import org.utbot.examples.samples.benchmark.Fibonacci
 import org.utbot.instrumentation.ConcreteExecutor
 import org.utbot.instrumentation.execute
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
-import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
+import org.utbot.instrumentation.instrumentation.coverage.InstructionCoverageInstrumentation
 import java.math.BigInteger
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Disabled
@@ -18,7 +18,7 @@ class TestBenchmarkClasses {
     @Disabled("Ask Sergey to check")
     fun testRepeater() {
         ConcreteExecutor(
-            CoverageInstrumentation.Factory,
+            InstructionCoverageInstrumentation.Factory,
             Repeater::class.java.protectionDomain.codeSource.location.path
         ).use {
             val dc0 = Repeater(", ")