uncommit

Author: ArsenHD

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt

@@ -51,6 +51,24 @@ val ClassId.denotableType: ClassId
         }
     }
 
+private val isLambdaRegex = ".*(\\$)lambda_.*".toRegex()
+
+val ClassId.isLambda: Boolean
+    get() = name matches isLambdaRegex
+
+val ClassId.isFunctionalInterface: Boolean
+    get() {
+        // we cannot access jClass of a builtin type, so we have to return false
+        if (this is BuiltinClassId) return false
+        // we cannot access jClass for lambdas, but we know that it is not a functional interface anyway
+        if (this.isLambda) return false
+
+        val clazz = this.jClass
+        if (!clazz.isInterface) return false
+
+        val abstractMethods = clazz.methods.filter { java.lang.reflect.Modifier.isAbstract(it.modifiers) }
+        return abstractMethods.size == 1
+    }
 
 @Suppress("unused")
 val ClassId.enclosingClass: ClassId?

utbot-framework/src/main/kotlin/org/utbot/engine/Extensions.kt

@@ -48,6 +48,7 @@ import kotlinx.collections.immutable.persistentHashMapOf
 import org.utbot.engine.pc.UtSolverStatusUNDEFINED
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.util.executableId
+import org.utbot.framework.plugin.api.util.isLambda
 import soot.ArrayType
 import soot.PrimType
 import soot.RefLikeType
@@ -198,10 +199,8 @@ private val isAnonymousRegex = ".*\\$\\d+$".toRegex()
 val SootClass.isAnonymous
     get() = name matches isAnonymousRegex
 
-private val isLambdaRegex = ".*(\\$)lambda_.*".toRegex()
-
 val SootClass.isLambda: Boolean
-    get() = name matches isLambdaRegex
+    get() = this.id.isLambda
 
 val Type.numDimensions get() = if (this is ArrayType) numDimensions else 0
 

utbot-framework/src/main/kotlin/org/utbot/engine/MockStrategy.kt

@@ -1,6 +1,7 @@
 package org.utbot.engine
 
 import org.utbot.framework.plugin.api.ClassId
+import org.utbot.framework.plugin.api.util.isFunctionalInterface
 
 /**
  * Mock strategies.
@@ -17,15 +18,24 @@ enum class MockStrategy {
     },
 
     OTHER_PACKAGES {
-        override fun eligibleToMock(classToMock: ClassId, classUnderTest: ClassId): Boolean =
-            classToMock != classUnderTest && classToMock.packageName.let {
-                it != classUnderTest.packageName && !isSystemPackage(it)
-            }
+        override fun eligibleToMock(classToMock: ClassId, classUnderTest: ClassId): Boolean {
+            if (classToMock == classUnderTest) return false
+            if (classToMock.packageName == classUnderTest.packageName) return false
+
+            // we always mock functional interfaces
+            if (classToMock.isFunctionalInterface) return true
+
+            return !isSystemPackage(classToMock.packageName)
+        }
     },
 
     OTHER_CLASSES {
-        override fun eligibleToMock(classToMock: ClassId, classUnderTest: ClassId): Boolean =
-                classToMock != classUnderTest && !isSystemPackage(classToMock.packageName)
+        override fun eligibleToMock(classToMock: ClassId, classUnderTest: ClassId): Boolean {
+            if (classToMock == classUnderTest) return false
+            // we always mock functional interfaces
+            if (classToMock.isFunctionalInterface) return true
+            return !isSystemPackage(classToMock.packageName)
+        }
     };
 
     /**