Minimize exceptions in signature

Author: sofurihafe

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

@@ -11,7 +11,6 @@ data class UtExecutionSuccess(val model: UtModel) : UtExecutionResult() {
 
 sealed class UtExecutionFailure : UtExecutionResult() {
     abstract val exception: Throwable
-    val isCheckedException get() = !(exception is RuntimeException || exception is Error)
 }
 
 data class UtOverflowFailure(

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

@@ -0,0 +1,12 @@
+package org.utbot.framework.plugin.api.util
+
+import org.utbot.framework.plugin.api.ClassId
+
+val Throwable.description
+    get() = message?.replace('\n', '\t') ?: "<Throwable with empty message>"
+
+val Throwable.isCheckedException
+    get() = !(this is RuntimeException|| this is Error)
+
+val ClassId.isCheckedException
+    get() = !(this.jClass == RuntimeException::class.java || this.jClass == Error::class.java)

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

@@ -153,7 +153,7 @@ import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.signature
 import org.utbot.framework.plugin.api.util.utContext
-import org.utbot.framework.util.description
+import org.utbot.framework.plugin.api.util.description
 import org.utbot.framework.util.executableId
 import org.utbot.fuzzer.FuzzedMethodDescription
 import org.utbot.fuzzer.ModelProvider

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

@@ -46,7 +46,6 @@ import org.utbot.framework.plugin.api.UtMethod
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtReferenceModel
 import org.utbot.framework.plugin.api.UtTestCase
-import org.utbot.framework.plugin.api.util.executableId
 import java.util.IdentityHashMap
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.PersistentMap
@@ -55,6 +54,11 @@ 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
+import org.utbot.framework.plugin.api.util.isNotSubtypeOf
+import org.utbot.framework.plugin.api.util.isCheckedException
+import org.utbot.framework.plugin.api.util.id
+import org.utbot.framework.plugin.api.util.executableId
 
 /**
  * Interface for all code generation context aware entities
@@ -232,7 +236,25 @@ internal interface CgContextOwner {
         currentExecutable = method.callable.executableId
     }
 
-    fun addException(exception: ClassId) {
+    fun addExceptionIfNeeded(exception: ClassId) {
+        when (exception) {
+            is BuiltinClassId -> {}
+            else -> {
+                if (exception isNotSubtypeOf Throwable::class.id) {
+                    error("Class $exception which is not a Throwable was passed")
+                }
+
+                val isUnchecked = !exception.isCheckedException
+                val alreadyAdded =
+                    collectedExceptions.any { existingException -> exception isSubtypeOf existingException }
+
+                if (isUnchecked || alreadyAdded) return
+
+                collectedExceptions
+                    .removeIf { existingException -> existingException isSubtypeOf exception }
+            }
+        }
+
         if (collectedExceptions.add(exception)) {
             importIfNeeded(exception)
         }
@@ -416,9 +438,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,15 +127,12 @@ 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) }
+            methodId.findExceptionTypes().forEach { addExceptionIfNeeded(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)
-            return
+            addExceptionIfNeeded(Throwable::class.id)
         }
 
         val methodIsUnderTestAndThrowsExplicitly = methodId == currentExecutable
@@ -148,13 +145,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)
         }
     }
 

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

@@ -26,7 +26,7 @@ import org.utbot.framework.codegen.model.visitor.importUtilMethodDependencies
 import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.UtMethod
 import org.utbot.framework.plugin.api.UtTestCase
-import org.utbot.framework.util.description
+import org.utbot.framework.plugin.api.util.description
 import kotlin.reflect.KClass
 
 internal class CgTestClassConstructor(val context: CgContext) :

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

@@ -16,7 +16,7 @@ import org.utbot.framework.plugin.api.UtMethod
 import org.utbot.framework.plugin.api.UtTestCase
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.withUtContext
-import org.utbot.framework.util.description
+import org.utbot.framework.plugin.api.util.description
 import kotlin.reflect.KClass
 import mu.KotlinLogging
 import org.junit.jupiter.api.Assertions.assertTrue

utbot-framework/src/test/kotlin/org/utbot/framework/codegen/BaseTestCodeGeneratorPipeline.kt

@@ -10,6 +10,7 @@ import org.utbot.framework.plugin.api.UtImplicitlyThrownException
 import org.utbot.framework.plugin.api.UtOverflowFailure
 import org.utbot.framework.plugin.api.UtTestCase
 import org.utbot.framework.plugin.api.UtTimeoutException
+import org.utbot.framework.plugin.api.util.isCheckedException
 import org.utbot.summary.UtSummarySettings.MIN_NUMBER_OF_EXECUTIONS_FOR_CLUSTERING
 import org.utbot.summary.clustering.MatrixUniqueness
 import org.utbot.summary.clustering.SplitSteps
@@ -147,8 +148,8 @@ enum class ClusterKind {
 
 private fun UtExecutionResult.clusterKind() = when (this) {
     is UtExecutionSuccess -> ClusterKind.SUCCESSFUL_EXECUTIONS
-    is UtImplicitlyThrownException -> if (this.isCheckedException) ClusterKind.CHECKED_EXCEPTIONS else ClusterKind.ERROR_SUITE
-    is UtExplicitlyThrownException -> if (this.isCheckedException) ClusterKind.CHECKED_EXCEPTIONS else ClusterKind.EXPLICITLY_THROWN_UNCHECKED_EXCEPTIONS
+    is UtImplicitlyThrownException -> if (this.exception.isCheckedException) ClusterKind.CHECKED_EXCEPTIONS else ClusterKind.ERROR_SUITE
+    is UtExplicitlyThrownException -> if (this.exception.isCheckedException) ClusterKind.CHECKED_EXCEPTIONS else ClusterKind.EXPLICITLY_THROWN_UNCHECKED_EXCEPTIONS
     is UtOverflowFailure -> ClusterKind.OVERFLOWS
     is UtTimeoutException -> ClusterKind.TIMEOUTS
     is UtConcreteExecutionFailure -> ClusterKind.CRASH_SUITE