minor

Author: DaniilStepanov

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtFuzzingExecutionInstrumentation.kt

@@ -1,5 +1,6 @@
 package org.utbot.framework.concrete
 
+import org.objectweb.asm.Type
 import org.utbot.framework.concrete.constructors.ConstructOnlyUserClassesOrCachedObjectsStrategy
 import org.utbot.framework.concrete.mock.InstrumentationContext
 import org.utbot.framework.concrete.phases.PhaseError
@@ -62,7 +63,7 @@ object UtFuzzingExecutionInstrumentation : UtExecutionInstrumentationWithStatsCo
 
                 // statistics collection
                 val coverage = statisticsCollectionContext.start { getCoverage(clazz) }.toLocalCoverage(traceHandler)
-                val classJVMName = clazz.name.replace('.', '/')
+                val classJVMName = Type.getInternalName(clazz)
                 val methodInstructions =
                     traceHandler.processingStorage.getMethodInstructions(classJVMName, methodSignature)
 
@@ -140,7 +141,7 @@ object UtFuzzingExecutionInstrumentationWithStateAfterCollection : UtExecutionIn
 
                 // statistics collection
                 val coverage = statisticsCollectionContext.start { getCoverage(clazz) }.toLocalCoverage(traceHandler)
-                val classJVMName = clazz.name.replace('.', '/')
+                val classJVMName = Type.getInternalName(clazz)
                 val methodInstructions =
                     traceHandler.processingStorage.getMethodInstructions(classJVMName, methodSignature)
 

utbot-greyboxfuzzer/src/main/kotlin/org/utbot/greyboxfuzzer/GreyBoxFuzzer.kt

@@ -3,6 +3,7 @@ package org.utbot.greyboxfuzzer
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
 import mu.KotlinLogging
+import org.objectweb.asm.Type
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.isConstructor
 import org.utbot.framework.plugin.api.util.isStatic
@@ -242,7 +243,7 @@ class GreyBoxFuzzer(
     ): Set<Instruction> {
         val currentMethodCoverage = coverage.coveredInstructions
             .asSequence()
-            .filter { it.className == methodUnderTest.classId.name.replace('.', '/') }
+            .filter { it.className == Type.getInternalName(methodUnderTest.classId.jClass) }
             .filter { it.methodSignature == methodUnderTest.signature }
 //            .map { it.id }
             //.filter { it in methodInstructionsIds!! }
@@ -256,7 +257,7 @@ class GreyBoxFuzzer(
         methodInstructions ?: return false
         val coveredInstructions =
             CoverageCollector.coverage
-                .filter { it.className == methodUnderTest.classId.name.replace('.', '/') }
+                .filter { it.className == Type.getInternalName(methodUnderTest.classId.jClass) }
                 .filter { it.methodSignature == methodUnderTest.signature }
                 .toSet()
         return coveredInstructions.containsAll(methodInstructions!!)

utbot-greyboxfuzzer/src/main/kotlin/org/utbot/greyboxfuzzer/util/GreyBoxFuzzingStatisticPrinter.kt

@@ -1,7 +1,9 @@
 package org.utbot.greyboxfuzzer.util
 
+import org.objectweb.asm.Type
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.UtExecution
+import org.utbot.framework.plugin.api.util.jClass
 
 object GreyBoxFuzzingStatisticPrinter {
 
@@ -16,7 +18,7 @@ object GreyBoxFuzzingStatisticPrinter {
         for ((method, instructions) in methodsToInstructionsNumbers) {
             val coveredMethodInstructions = CoverageCollector.coverage
                 .asSequence()
-                .filter { it.className == method.classId.name.replace('.', '/') }
+                .filter { it.className == Type.getInternalName(method.classId.jClass) }
                 .filter { it.methodSignature == method.signature }
                 .toSet()
             val coveredMethodLines = coveredMethodInstructions.map { it.lineNumber }.toSet()

utbot-junit-contest/src/main/kotlin/org/utbot/contest/GreyBoxFuzzerContest.kt

@@ -105,10 +105,7 @@ class GreyBoxFuzzerContest {
             var testsCounter = 0
             for (test in testSet) {
                 val method = test.method
-                val statsForMethod = StatsForMethod(
-                    "${method.classId.simpleName}#${method.name}#${method.signature}",
-                    Type.getInternalName(method.classId.jClass)
-                )
+                val statsForMethod = StatsForMethod("${method.classId.simpleName}#${method.name}")
                 statsForClass.statsForMethods.add(statsForMethod)
                 for (result in test.executions) {
                     try {