@@ -181,21 +181,11 @@ abstract class TestFramework(
181181 abstract val assertionsClass: ClassId
182182 abstract val arraysAssertionsClass: ClassId
183183 abstract val kotlinFailureAssertionsClass: ClassId
184- abstract val testAnnotation: String
185184 abstract val testAnnotationId: ClassId
186- abstract val testAnnotationFqn: String
187- abstract val beforeMethod: String
188185 abstract val beforeMethodId: ClassId
189- abstract val beforeMethodFqn: String
190- abstract val afterMethod: String
191186 abstract val afterMethodId: ClassId
192- abstract val afterMethodFqn: String
193- abstract val parameterizedTestAnnotation: String
194187 abstract val parameterizedTestAnnotationId: ClassId
195- abstract val parameterizedTestAnnotationFqn: String
196- abstract val methodSourceAnnotation: String
197188 abstract val methodSourceAnnotationId: ClassId
198- abstract val methodSourceAnnotationFqn: String
199189 abstract val nestedClassesShouldBeStatic: Boolean
200190 abstract val argListClassId: ClassId
201191
@@ -270,32 +260,21 @@ abstract class TestFramework(
270260object TestNg : TestFramework(id = " TestNG" ,displayName = " TestNG" ) {
271261 override val mainPackage: String = TEST_NG_PACKAGE
272262
273- override val testAnnotation: String = " @$mainPackage .Test"
274- override val testAnnotationFqn: String = " $mainPackage .Test"
275263 override val testAnnotationId: ClassId = BuiltinClassId (
276264 canonicalName = " $mainPackage .annotations.Test" ,
277265 simpleName = " Test"
278266 )
279267
280- override val beforeMethod = " @${mainPackage} .BeforeMethod"
281- override val beforeMethodFqn = " ${mainPackage} .BeforeMethod"
282268 override val beforeMethodId = BuiltinClassId (
283- canonicalName = " ${ mainPackage} .BeforeMethod" ,
269+ canonicalName = " $mainPackage .annotations .BeforeMethod" ,
284270 simpleName = " BeforeMethod"
285271 )
286272
287- override val afterMethod = " @${mainPackage} .AfterMethod"
288- override val afterMethodFqn = " ${mainPackage} .AfterMethod"
289273 override val afterMethodId = BuiltinClassId (
290- canonicalName = " ${ mainPackage} .AfterMethod" ,
274+ canonicalName = " $mainPackage .annotations .AfterMethod" ,
291275 simpleName = " AfterMethod"
292276 )
293277
294- override val parameterizedTestAnnotation: String = " @$mainPackage .Test"
295- override val parameterizedTestAnnotationFqn: String = " @$mainPackage .Test"
296- override val methodSourceAnnotation: String = " @$mainPackage .DataProvider"
297- override val methodSourceAnnotationFqn: String = " @$mainPackage .DataProvider"
298-
299278 internal const val testXmlName: String = " testng.xml"
300279
301280 override val assertionsClass: ClassId = BuiltinClassId (
@@ -393,36 +372,21 @@ object Junit4 : TestFramework(id = "JUnit4",displayName = "JUnit 4") {
393372
394373 override val mainPackage: String = JUNIT4_PACKAGE
395374
396- override val testAnnotation = " @$mainPackage .Test"
397- override val testAnnotationFqn: String = " $mainPackage .Test"
398375 override val testAnnotationId = BuiltinClassId (
399376 canonicalName = " $mainPackage .Test" ,
400377 simpleName = " Test"
401378 )
402379
403- override val beforeMethod = " @$mainPackage .Before"
404- override val beforeMethodFqn = " $mainPackage .Before"
405380 override val beforeMethodId = BuiltinClassId (
406381 canonicalName = " $mainPackage .Before" ,
407382 simpleName = " Before"
408383 )
409384
410- override val afterMethod = " @$mainPackage .After"
411- override val afterMethodFqn = " $mainPackage .After"
412385 override val afterMethodId = BuiltinClassId (
413386 canonicalName = " $mainPackage .After" ,
414387 simpleName = " After"
415388 )
416389
417- override val parameterizedTestAnnotation
418- get() = parametrizedTestsNotSupportedError
419- override val parameterizedTestAnnotationFqn
420- get() = parametrizedTestsNotSupportedError
421- override val methodSourceAnnotation
422- get() = parametrizedTestsNotSupportedError
423- override val methodSourceAnnotationFqn
424- get() = parametrizedTestsNotSupportedError
425-
426390 override val parameterizedTestAnnotationId = voidClassId
427391 override val methodSourceAnnotationId = voidClassId
428392
@@ -468,32 +432,21 @@ object Junit4 : TestFramework(id = "JUnit4",displayName = "JUnit 4") {
468432object Junit5 : TestFramework(id = " JUnit5" , displayName = " JUnit 5" ) {
469433 override val mainPackage: String = JUNIT5_PACKAGE
470434
471- override val testAnnotation = " @$mainPackage .Test"
472- override val testAnnotationFqn: String = " $mainPackage .Test"
473435 override val testAnnotationId = BuiltinClassId (
474436 canonicalName = " $JUNIT5_PACKAGE .Test" ,
475437 simpleName = " Test"
476438 )
477439
478- override val beforeMethod = " @${mainPackage} .BeforeEach"
479- override val beforeMethodFqn = " ${mainPackage} .BeforeEach"
480440 override val beforeMethodId = BuiltinClassId (
481441 canonicalName = " ${mainPackage} .BeforeEach" ,
482442 simpleName = " BeforeEach"
483443 )
484444
485- override val afterMethod = " @${mainPackage} .AfterEach"
486- override val afterMethodFqn = " ${mainPackage} .AfterEach"
487445 override val afterMethodId = BuiltinClassId (
488446 canonicalName = " ${mainPackage} .AfterEach" ,
489447 simpleName = " AfterEach"
490448 )
491449
492- override val parameterizedTestAnnotation = " $JUNIT5_PARAMETERIZED_PACKAGE .ParameterizedTest"
493- override val parameterizedTestAnnotationFqn: String = " $JUNIT5_PARAMETERIZED_PACKAGE .ParameterizedTest"
494- override val methodSourceAnnotation: String = " $JUNIT5_PARAMETERIZED_PACKAGE .provider.MethodSource"
495- override val methodSourceAnnotationFqn: String = " $JUNIT5_PARAMETERIZED_PACKAGE .provider.MethodSource"
496-
497450 val executableClassId = BuiltinClassId (
498451 canonicalName = " $JUNIT5_PACKAGE .function.Executable" ,
499452 simpleName = " Executable"
0 commit comments