From adbf9f8aa69606350350f8864490f48368c5369f Mon Sep 17 00:00:00 2001 From: Egor Kulikov Date: Mon, 10 Jul 2023 00:13:55 +0300 Subject: [PATCH] Correct annotations for parameterized tests in TestNg --- .../framework/TestFrameworkManager.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/TestFrameworkManager.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/TestFrameworkManager.kt index d1ebc9727f..7cc8ab4015 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/TestFrameworkManager.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/TestFrameworkManager.kt @@ -294,10 +294,11 @@ internal class TestNgManager(context: CgContext) : TestFrameworkManager(context) } override fun addDataProviderAnnotations(dataProviderMethodName: String) { + val nameArgument = CgNamedAnnotationArgument("name", stringLiteral(dataProviderMethodName)) statementConstructor.addAnnotation( - testFramework.methodSourceAnnotationId, - listOf("name" to stringLiteral(dataProviderMethodName)), - Method, + classId = testFramework.methodSourceAnnotationId, + namedArguments = listOf(nameArgument), + target = Method, ) } @@ -307,11 +308,13 @@ internal class TestNgManager(context: CgContext) : TestFrameworkManager(context) } override fun addParameterizedTestAnnotations(dataProviderMethodName: String?) { - statementConstructor.addAnnotation( - testFramework.parameterizedTestAnnotationId, - listOf("dataProvider" to CgLiteral(stringClassId, dataProviderMethodName)), - Method, - ) + val dataProviderArgument = + CgNamedAnnotationArgument("dataProvider", CgLiteral(stringClassId, dataProviderMethodName)) + statementConstructor.addAnnotation( + classId = testFramework.parameterizedTestAnnotationId, + namedArguments = listOf(dataProviderArgument), + target = Method, + ) } override fun passArgumentsToArgsVariable(argsVariable: CgVariable, argsArray: CgVariable, executionIndex: Int) =