@@ -231,8 +231,10 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
231231 val fieldAccessible = field.isAccessibleFrom(testClassPackageName)
232232
233233 // prevValue is nullable if not accessible because of getStaticFieldValue(..) : Any?
234- val prevValue = newVar(CgClassId (field.type, isNullable = ! fieldAccessible),
235- " prev${field.name.capitalize()} " ) {
234+ val prevValue = newVar(
235+ CgClassId (field.type, isNullable = ! fieldAccessible),
236+ " prev${field.name.capitalize()} "
237+ ) {
236238 if (fieldAccessible) {
237239 declaringClass[field]
238240 } else {
@@ -1198,7 +1200,8 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
11981200 it.variableName,
11991201 // guard initializer to reuse typecast creation logic
12001202 initializer = guardExpression(varType, nullLiteral()).expression,
1201- isMutable = true )
1203+ isMutable = true ,
1204+ )
12021205 }
12031206 + tryWithMocksFinallyClosing
12041207 }
@@ -1253,10 +1256,13 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
12531256 }
12541257 val method = currentExecutable as MethodId
12551258 val containsFailureExecution = containsFailureExecution(testSet)
1256- if (method.returnType != voidClassId) {
1259+
1260+ val expectedResultClassId = wrapTypeIfRequired(method.returnType)
1261+
1262+ if (expectedResultClassId != voidClassId) {
12571263 testArguments + = CgParameterDeclaration (
1258- expectedResultVarName, resultClassId(method.returnType ),
1259- isReferenceType = containsFailureExecution || ! method.returnType .isPrimitive
1264+ expectedResultVarName, resultClassId(expectedResultClassId ),
1265+ isReferenceType = containsFailureExecution || ! expectedResultClassId .isPrimitive
12601266 )
12611267 }
12621268 if (containsFailureExecution) {
0 commit comments