Review fixes

Author: CaelmBleidd

utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt

@@ -382,6 +382,18 @@ object UtSettings : AbstractSettings(
      * and test generation.
      */
     var useSandbox by getBooleanProperty(true)
+
+    /**
+     * If this options set in true, all soot classes will be removed from a Soot Scene,
+     * therefore, you will be unable to test soot classes.
+     */
+    var removeSootClassesFromHierarchy by getBooleanProperty(true)
+
+    /**
+     * If this options set in true, all soot classes will be removed from a Soot Scene,
+     * therefore, you will be unable to test soot classes.
+     */
+    var removeUtBotClassesFromHierarchy by getBooleanProperty(true)
 }
 
 /**

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

@@ -140,8 +140,8 @@ class TypeStorage private constructor(val leastCommonType: Type, val possibleCon
         ): TypeStorage = TypeStorage(leastCommonType, possibleConcreteTypes)
 
         /**
-         * Constructs a type storage with some type. In this case [possibleConcreteTypes] might contains
-         * abstract class or interface. Usually it means such typeStorage represents wrapper object type.
+         * Constructs a type storage with some type. In this case [possibleConcreteTypes] might contain
+         * an abstract class or an interface. Usually it means such typeStorage represents wrapper object type.
          */
         fun constructTypeStorageWithSingleType(
             leastCommonType: Type

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

@@ -616,10 +616,9 @@ class TypeRegistry {
     fun createClassRef(baseType: Type, numDimensions: Int = 0): MethodResult {
         val addr = classRefBiMap.getOrPut(baseType) { nextClassRefAddr() }
 
-        val objectTypeStorage = TypeStorage.constructTypeStorageWithSingleType(CLASS_REF_TYPE)
+        val classRefTypeStorage = TypeStorage.constructTypeStorageWithSingleType(CLASS_REF_TYPE)
         val objectValue = ObjectValue(objectTypeStorage, addr)
 
-        val classRefTypeStorage = TypeStorage.constructTypeStorageWithSingleType(CLASS_REF_TYPE)
         val typeConstraint = typeConstraint(addr, classRefTypeStorage).all()
 
         val typeId = mkInt(findTypeId(baseType))

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

@@ -3,6 +3,7 @@ package org.utbot.framework.util
 import org.utbot.common.FileUtil
 import org.utbot.engine.jimpleBody
 import org.utbot.engine.pureJavaSignature
+import org.utbot.framework.UtSettings
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.services.JdkInfo
 import soot.G
@@ -93,7 +94,7 @@ private fun initSoot(buildDirs: List<Path>, classpath: String?, jdkInfo: JdkInfo
         val isUtBotPackage = it.packageName.startsWith(UTBOT_PACKAGE_PREFIX)
 
         // remove our own classes from the soot scene
-        if (isUtBotPackage) {
+        if (UtSettings.removeUtBotClassesFromHierarchy && 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)
@@ -106,7 +107,7 @@ private fun initSoot(buildDirs: List<Path>, classpath: String?, jdkInfo: JdkInfo
         }
 
         // remove soot's classes from the scene, because we don't wont to analyze them
-        if (it.packageName.startsWith(SOOT_PACKAGE_PREFIX)) {
+        if (UtSettings.removeSootClassesFromHierarchy && it.packageName.startsWith(SOOT_PACKAGE_PREFIX)) {
             Scene.v().removeClass(it)
             return@forEach
         }