Render collected exceptions in data provider methods of parametrized …

…tests
UnitTestBot · EgorkaKulikov · Jul 8, 2022 · Jul 5, 2022 · Jul 7, 2022 · Jul 7, 2022
commit b7293cf7b0d264baea89033fc0678d99086c324f
diff --git a/...main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt b/...main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt
@@ -155,6 +155,8 @@ internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableA
         }
     }
 
+    //WARN: if you make changes in the following sets of exceptions,
+    //don't forget to change them in hardcoded [UtilMethods] as well
     private fun BuiltinMethodId.findExceptionTypes(): Set<ClassId> {
         if (!this.isUtil) return emptySet()
 
@@ -164,9 +166,9 @@ internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableA
                 getStaticFieldValueMethodId,
                 getFieldValueMethodId,
                 setStaticFieldMethodId,
-                setFieldMethodId,
-                createInstanceMethodId,
-                getUnsafeInstanceMethodId -> setOf(Exception::class.id)
+                setFieldMethodId -> setOf(IllegalAccessException::class.id, NoSuchFieldException::class.id)
+                createInstanceMethodId -> setOf(Exception::class.id)
+                getUnsafeInstanceMethodId -> setOf(ClassNotFoundException::class.id, NoSuchFieldException::class.id, IllegalAccessException::class.id)
                 createArrayMethodId -> setOf(ClassNotFoundException::class.id)
                 deepEqualsMethodId,
                 arraysDeepEqualsMethodId,

diff --git a/...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt b/...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
@@ -1300,14 +1300,15 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
         utTestCase: UtTestCase,
         dataProviderMethodName: String
     ): CgParameterizedTestDataProviderMethod {
-        val parametersStatements = mutableListOf<CgStatement>()
+        val dataProviderStatements = mutableListOf<CgStatement>()
+        val dataProviderExceptions = mutableSetOf<ClassId>()
 
         val argListLength = utTestCase.executions.size
         val argListDeclaration = createArgList(argListLength)
         val argListVariable = argListDeclaration.variable
 
-        parametersStatements += argListDeclaration
-        parametersStatements += CgEmptyLine()
+        dataProviderStatements += argListDeclaration
+        dataProviderStatements += CgEmptyLine()
 
         for ((execIndex, execution) in utTestCase.executions.withIndex()) {
             withTestMethodScope(execution) {
@@ -1347,22 +1348,25 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                 }
 
                 //create a block for current test case
-                parametersStatements += innerBlock(
+                dataProviderStatements += innerBlock(
                     {},
                     block(executionArgumentsBody)
                             + createArgumentsCallRepresentation(execIndex, argListVariable, arguments)
                 )
+
+                dataProviderExceptions += collectedExceptions
             }
         }
 
-        parametersStatements.addEmptyLineIfNeeded()
-        parametersStatements += CgReturnStatement(argListVariable)
+        dataProviderStatements.addEmptyLineIfNeeded()
+        dataProviderStatements += CgReturnStatement(argListVariable)
 
         return buildParameterizedTestDataProviderMethod {
             name = dataProviderMethodName
             returnType = argListClassId()
-            statements = parametersStatements
+            statements = dataProviderStatements
             annotations = createDataProviderAnnotations(dataProviderMethodName)
+            exceptions = dataProviderExceptions
         }
     }
 

diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/Builders.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/Builders.kt
@@ -101,10 +101,10 @@ class CgParameterizedTestDataProviderBuilder : CgMethodBuilder<CgParameterizedTe
     override val parameters: List<CgParameterDeclaration> = mutableListOf()
     override lateinit var statements: List<CgStatement>
     override lateinit var annotations: MutableList<CgAnnotation>
-    override val exceptions: MutableSet<ClassId> = mutableSetOf()
+    override lateinit var exceptions: MutableSet<ClassId>
     override var documentation: CgDocumentationComment = CgDocumentationComment(emptyList())
 
-    override fun build() = CgParameterizedTestDataProviderMethod(name, statements, returnType, annotations)
+    override fun build() = CgParameterizedTestDataProviderMethod(name, statements, returnType, annotations, exceptions)
 }
 
 fun buildParameterizedTestDataProviderMethod(

diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/CgElement.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/CgElement.kt
@@ -223,9 +223,8 @@ class CgParameterizedTestDataProviderMethod(
     override val statements: List<CgStatement>,
     override val returnType: ClassId,
     override val annotations: List<CgAnnotation>,
+    override val exceptions: Set<ClassId>,
 ) : CgMethod(isStatic = true) {
-    override val exceptions: Set<ClassId> = emptySet()
-
     override val parameters: List<CgParameterDeclaration> = emptyList()
     override val documentation: CgDocumentationComment = CgDocumentationComment(emptyList())
     override val requiredFields: List<CgParameterDeclaration> = emptyList()

diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgJavaRenderer.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgJavaRenderer.kt
@@ -213,7 +213,8 @@ internal class CgJavaRenderer(context: CgContext, printer: CgPrinter = CgPrinter
         //we do not have a good string representation for two-dimensional array, so this strange if-else is required
         val returnType =
             if (element.returnType.simpleName == "Object[][]") "java.lang.Object[][]" else "${element.returnType}"
-        print("public static $returnType ${element.name}() throws Exception")
+        print("public static $returnType ${element.name}()")
+        renderExceptions(element)
     }
 
     override fun visit(element: CgInnerBlock) {

diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/UtilMethods.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/UtilMethods.kt
@@ -329,8 +329,7 @@ fun createInstance(language: CodegenLanguage): String =
     when (language) {
         CodegenLanguage.JAVA -> {
             """
-            private static Object createInstance(String className) 
-                    throws ClassNotFoundException, NoSuchMethodException, NoSuchFieldException, IllegalAccessException, InvocationTargetException {
+            private static Object createInstance(String className) throws Exception {
                 Class<?> clazz = Class.forName(className);
                 return Class.forName("sun.misc.Unsafe").getDeclaredMethod("allocateInstance", Class.class)
                     .invoke(getUnsafeInstance(), clazz);