Minimize exceptions in signature

Author: sofurihafe

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt

@@ -55,6 +55,7 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.persistentSetOf
 import org.utbot.framework.codegen.model.constructor.builtin.streamsDeepEqualsMethodId
+import org.utbot.framework.plugin.api.util.isSubtypeOf
 
 /**
  * Interface for all code generation context aware entities
@@ -232,7 +233,14 @@ internal interface CgContextOwner {
         currentExecutable = method.callable.executableId
     }
 
-    fun addException(exception: ClassId) {
+    fun addExceptionIfNeeded(exception: ClassId) {
+        collectedExceptions.forEach {
+            if (it isSubtypeOf exception) return
+        }
+        collectedExceptions.forEach {
+            if (exception isSubtypeOf it) collectedExceptions.remove(it)
+        }
+
         if (collectedExceptions.add(exception)) {
             importIfNeeded(exception)
         }
@@ -416,9 +424,9 @@ internal data class CgContext(
         val simpleName = testClassCustomName ?: "${createTestClassName(classUnderTest.name)}Test"
         val name = "$packagePrefix$simpleName"
         BuiltinClassId(
-                name = name,
-                canonicalName = name,
-                simpleName = simpleName
+            name = name,
+            canonicalName = name,
+            simpleName = simpleName
         )
     }
 

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

@@ -127,14 +127,7 @@ internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableA
         //Builtin methods does not have jClass, so [methodId.method] will crash on it,
         //so we need to collect required exceptions manually from source codes
         if (methodId is BuiltinMethodId) {
-            methodId.findExceptionTypes().forEach { addException(it) }
-            return
-        }
-        //If [InvocationTargetException] is thrown manually in test, we need
-        // to add "throws Throwable" and other exceptions are not required so on.
-        if (methodId == getTargetException) {
-            collectedExceptions.clear()
-            addException(Throwable::class.id)
+            methodId.findExceptionTypes().forEach { addExceptionIfNeeded(it) }
             return
         }
 
@@ -148,13 +141,13 @@ internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableA
             return
         }
 
-        methodId.method.exceptionTypes.forEach { addException(it.id) }
+        methodId.method.exceptionTypes.forEach { addExceptionIfNeeded(it.id) }
     }
 
     private fun newConstructorCall(constructorId: ConstructorId) {
         importIfNeeded(constructorId.classId)
         for (exception in constructorId.exceptions) {
-            addException(exception)
+            addExceptionIfNeeded(exception)
         }
     }