Skip to content

Commit 5f1d104

Browse files
Correct annotations in TestNg and cleanup code (#2138)
* Correct annotations fqn in TestNg * Cleanup TestFramework abstraction
1 parent 8ab3b89 commit 5f1d104

File tree

3 files changed

+3
-86
lines changed
  • utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain
  • utbot-js/src/main/kotlin/framework/codegen
  • utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model

3 files changed

+3
-86
lines changed

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/Domain.kt

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -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(
270260
object 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") {
468432
object 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"

utbot-js/src/main/kotlin/framework/codegen/JsDomain.kt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,9 @@ object Mocha : TestFramework(id = "Mocha", displayName = "Mocha") {
1616
override val assertionsClass = jsUndefinedClassId
1717
override val arraysAssertionsClass = jsUndefinedClassId
1818
override val kotlinFailureAssertionsClass: ClassId = jsUndefinedClassId
19-
override val testAnnotation = ""
20-
override val testAnnotationFqn = ""
2119

22-
override val beforeMethod: String = ""
2320
override val beforeMethodId: ClassId = jsUndefinedClassId
24-
override val beforeMethodFqn: String = ""
25-
26-
override val afterMethod: String = ""
2721
override val afterMethodId: ClassId = jsUndefinedClassId
28-
override val afterMethodFqn: String = ""
29-
30-
override val parameterizedTestAnnotation: String
31-
get() = throw UnsupportedOperationException("Parameterized tests are not supported for Mocha")
32-
override val parameterizedTestAnnotationFqn: String
33-
get() = throw UnsupportedOperationException("Parameterized tests are not supported for Mocha")
34-
override val methodSourceAnnotation: String
35-
get() = throw UnsupportedOperationException("Parameterized tests are not supported for Mocha")
36-
override val methodSourceAnnotationFqn: String
37-
get() = throw UnsupportedOperationException("Parameterized tests are not supported for Mocha")
3822

3923
override val nestedClassesShouldBeStatic: Boolean
4024
get() = false

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/PythonDomain.kt

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,18 @@ object Pytest : TestFramework(displayName = "pytest", id = "pytest") {
1616
override val assertionsClass: ClassId = pythonNoneClassId
1717
override val arraysAssertionsClass: ClassId = assertionsClass
1818
override val kotlinFailureAssertionsClass: ClassId = assertionsClass
19-
override val testAnnotation: String
20-
get() = TODO("Not yet implemented")
19+
2120
override val testAnnotationId: ClassId = BuiltinClassId(
2221
canonicalName = "pytest",
2322
simpleName = "Tests"
2423
)
25-
override val testAnnotationFqn: String = ""
2624

27-
override val beforeMethod: String = ""
2825
override val beforeMethodId: ClassId = pythonAnyClassId
29-
override val beforeMethodFqn: String = ""
3026

31-
override val afterMethod: String = ""
3227
override val afterMethodId: ClassId = pythonAnyClassId
33-
override val afterMethodFqn: String = ""
3428

35-
override val parameterizedTestAnnotation: String = ""
3629
override val parameterizedTestAnnotationId: ClassId = pythonAnyClassId
37-
override val parameterizedTestAnnotationFqn: String = ""
38-
override val methodSourceAnnotation: String = ""
3930
override val methodSourceAnnotationId: ClassId = pythonAnyClassId
40-
override val methodSourceAnnotationFqn: String = ""
4131
override val nestedClassesShouldBeStatic: Boolean = false
4232
override val argListClassId: ClassId = pythonAnyClassId
4333

@@ -67,27 +57,17 @@ object Unittest : TestFramework(displayName = "Unittest", id = "Unittest") {
6757
override val assertionsClass: ClassId = PythonClassId("self")
6858
override val arraysAssertionsClass: ClassId = assertionsClass
6959
override val kotlinFailureAssertionsClass: ClassId = assertionsClass
70-
override val testAnnotation: String = ""
7160
override val testAnnotationId: ClassId = BuiltinClassId(
7261
canonicalName = "Unittest",
7362
simpleName = "Tests"
7463
)
75-
override val testAnnotationFqn: String = "unittest"
7664

77-
override val beforeMethod: String = ""
7865
override val beforeMethodId: ClassId = pythonAnyClassId
79-
override val beforeMethodFqn: String = ""
8066

81-
override val afterMethod: String = ""
8267
override val afterMethodId: ClassId = pythonAnyClassId
83-
override val afterMethodFqn: String = ""
8468

85-
override val parameterizedTestAnnotation: String = ""
8669
override val parameterizedTestAnnotationId: ClassId = pythonAnyClassId
87-
override val parameterizedTestAnnotationFqn: String = ""
88-
override val methodSourceAnnotation: String = ""
8970
override val methodSourceAnnotationId: ClassId = pythonAnyClassId
90-
override val methodSourceAnnotationFqn: String = ""
9171
override val nestedClassesShouldBeStatic: Boolean = false
9272
override val argListClassId: ClassId = pythonAnyClassId
9373

0 commit comments

Comments
 (0)