Simplify some util methods checks

Author: ArsenHD

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt

@@ -18,7 +18,6 @@ import org.utbot.framework.codegen.model.constructor.util.CgComponents
 import org.utbot.framework.codegen.model.constructor.util.classCgClassId
 import org.utbot.framework.codegen.model.constructor.util.getAmbiguousOverloadsOf
 import org.utbot.framework.codegen.model.constructor.util.importIfNeeded
-import org.utbot.framework.codegen.model.constructor.util.isTestClassUtil
 import org.utbot.framework.codegen.model.constructor.util.isUtil
 import org.utbot.framework.codegen.model.constructor.util.typeCast
 import org.utbot.framework.codegen.model.tree.CgAllocateArray
@@ -107,7 +106,7 @@ internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableA
     }
 
     private fun newMethodCall(methodId: MethodId) {
-        if (isTestClassUtil(methodId)) requiredUtilMethods += methodId
+        if (isUtil(methodId)) requiredUtilMethods += methodId
         importIfNeeded(methodId)
 
         //Builtin methods does not have jClass, so [methodId.method] will crash on it,
@@ -226,7 +225,7 @@ internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableA
      * @return true if a method can be called with the given arguments without reflection
      */
     private fun MethodId.canBeCalledWith(caller: CgExpression?, args: List<CgExpression>): Boolean =
-        (isTestClassUtil(this) || isAccessibleFrom(testClassPackageName))
+        (isUtil(this) || isAccessibleFrom(testClassPackageName))
                 && caller canBeReceiverOf this
                 && args canBeArgsOf this
 

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt

@@ -45,7 +45,6 @@ import org.utbot.framework.plugin.api.UtNullModel
 import org.utbot.framework.plugin.api.UtPrimitiveModel
 import org.utbot.framework.plugin.api.WildcardTypeParameter
 import org.utbot.framework.plugin.api.util.arrayLikeName
-import org.utbot.framework.codegen.model.constructor.builtin.TestClassUtilMethodProvider
 
 internal data class EnvironmentFieldStateCache(
     val thisInstance: FieldStateCache,
@@ -130,13 +129,6 @@ internal fun CgContextOwner.isUtil(method: MethodId): Boolean {
     return method in utilMethodProvider.utilMethodIds
 }
 
-/**
- * Check if a method is an util method that is declared in the test class (not taken from the codegen utils library)
- */
-internal fun CgContextOwner.isTestClassUtil(method: MethodId): Boolean {
-    return utilMethodProvider is TestClassUtilMethodProvider && isUtil(method)
-}
-
 val classCgClassId = CgClassId(Class::class.id, typeParameters = WildcardTypeParameter(), isNullable = false)
 
 internal fun getStaticFieldVariableName(owner: ClassId, path: FieldPath): String {