change signature format

Author: SBOne-Kenobi

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

@@ -1,8 +1,9 @@
 package org.utbot.framework.concrete
 
-import org.utbot.framework.plugin.api.util.signature
 import java.lang.reflect.Method
 import java.util.IdentityHashMap
+import org.objectweb.asm.Type
+import org.utbot.framework.plugin.api.util.signature
 
 /**
  * Some information, which is computed after classes instrumentation.
@@ -66,7 +67,9 @@ class InstrumentationContext {
         }
 
         fun updateMocks(obj: Any?, method: Method, values: List<*>) {
-            updateMocks(obj, method.signature, values)
+            val type = Type.getInternalName(method.declaringClass)
+            val signature = method.signature
+            updateMocks(obj, "$type@$signature", values)
         }
     }
 }

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

@@ -6,6 +6,7 @@ import org.utbot.instrumentation.instrumentation.mock.MockConfig
 import java.lang.reflect.Field
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
+import org.objectweb.asm.Type
 
 
 /**
@@ -31,7 +32,9 @@ class MethodMockController(
             error("$method is an instance method, but instance is null!")
         }
 
-        val id = instrumentationContext.methodSignatureToId[method.signature]
+        val type = Type.getInternalName(method.declaringClass)
+        val computedSignature = "$type@${method.signature}"
+        val id = instrumentationContext.methodSignatureToId[computedSignature]
 
         isMockField = clazz.declaredFields.firstOrNull { it.name == MockConfig.IS_MOCK_FIELD + id }
             ?: error("No field ${MockConfig.IS_MOCK_FIELD + id} in $clazz")

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/mock/MockClassVisitor.kt

@@ -73,7 +73,7 @@ class MockClassVisitor(
         val isStatic = access and Opcodes.ACC_STATIC != 0
         val isVoidMethod = Type.getReturnType(descriptor) == Type.VOID_TYPE
 
-        val computedSignature = name + descriptor
+        val computedSignature = "$internalClassName@$name$descriptor"
         val id = signatureToId.size
         signatureToId[computedSignature] = id