Remove our classes from the hierarchy

Author: CaelmBleidd

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

@@ -120,16 +120,14 @@ class TypeResolver(private val typeRegistry: TypeRegistry, private val hierarchy
             return false
         }
 
-        if (baseType.sootClass.packageName.startsWith("org.utbot")) {
-            return true
-        }
+        val baseSootClass = baseType.sootClass
 
-        if (baseType.sootClass.packageName.startsWith("soot")) {
+        // We don't want to have our wrapper's classes as a part of a regular TypeStorage instance
+        // Note that we cannot have here 'isOverridden' since iterators of our wrappers are not wrappers
+        if (wrapperToClass[baseType] != null) {
             return true
         }
 
-        val baseSootClass = baseType.sootClass
-
         if (numDimensions == 0 && baseSootClass.isInappropriate) {
             // interface, abstract class, or local, or mock could not be constructed
             return true

utbot-framework/src/main/kotlin/org/utbot/framework/util/SootUtils.kt

@@ -89,9 +89,31 @@ private fun initSoot(buildDirs: List<Path>, classpath: String?, jdkInfo: JdkInfo
     Scene.v().loadNecessaryClasses()
     PackManager.v().runPacks()
     // we need this to create hierarchy of classes
-    Scene.v().classes.forEach {
-        if (it.resolvingLevel() < SootClass.HIERARCHY)
+    Scene.v().classes.toList().forEach {
+        val isUtBotPackage = it.packageName.startsWith(UTBOT_PACKAGE_PREFIX)
+
+        // remove our own classes from the soot scene
+        if (isUtBotPackage) {
+            val isOverriddenPackage = it.packageName.startsWith(UTBOT_OVERRIDDEN_PACKAGE_PREFIX)
+            val isExamplesPackage = it.packageName.startsWith(UTBOT_EXAMPLES_PACKAGE_PREFIX)
+            val isApiPackage = it.packageName.startsWith(UTBOT_API_PACKAGE_PREFIX)
+
+            // remove if it is not a part of the examples (CUT), not a part of our API and not an override
+            if (!isOverriddenPackage && !isExamplesPackage && !isApiPackage) {
+                Scene.v().removeClass(it)
+                return@forEach
+            }
+        }
+
+        // remove soot's classes from the scene, because we don't wont to analyze them
+        if (it.packageName.startsWith(SOOT_PACKAGE_PREFIX)) {
+            Scene.v().removeClass(it)
+            return@forEach
+        }
+
+        if (it.resolvingLevel() < SootClass.HIERARCHY) {
             it.setResolvingLevel(SootClass.HIERARCHY)
+        }
     }
 }
 
@@ -171,4 +193,10 @@ private val classesToLoad = arrayOf(
     org.utbot.engine.overrides.stream.IntStream::class,
     org.utbot.engine.overrides.stream.LongStream::class,
     org.utbot.engine.overrides.stream.DoubleStream::class,
-).map { it.java }.toTypedArray()
+).map { it.java }.toTypedArray()
+
+private const val UTBOT_PACKAGE_PREFIX = "org.utbot"
+private const val UTBOT_EXAMPLES_PACKAGE_PREFIX = "$UTBOT_PACKAGE_PREFIX.examples"
+private const val UTBOT_API_PACKAGE_PREFIX = "$UTBOT_PACKAGE_PREFIX.api"
+private const val UTBOT_OVERRIDDEN_PACKAGE_PREFIX = "$UTBOT_PACKAGE_PREFIX.engine.overrides"
+private const val SOOT_PACKAGE_PREFIX = "soot."