Skip to content

Add specific annotations for Spring integration testing #2281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorkaKulikov merged 19 commits into from
Jun 28, 2023
Merged

Add specific annotations for Spring integration testing #2281

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dadf0bf
Add specific annotations for Spring integration testing
EgorkaKulikov Jun 13, 2023
be19ce0
Add Transactional and AutoConfigureTestDatabase annotations
EgorkaKulikov Jun 26, 2023
980a726
It compiles
EgorkaKulikov Jun 27, 2023
52c2321
Fixes
EgorkaKulikov Jun 27, 2023
49da0a9
Improve imports for annotations
EgorkaKulikov Jun 27, 2023
60090d1
Corrected addAnnotation signature
EgorkaKulikov Jun 28, 2023
e73e8f1
Non-significant changes
EgorkaKulikov Jun 28, 2023
1a1dc16
Removing CgAnnotation from return value
EgorkaKulikov Jun 28, 2023
7cb15f2
SpringModelUtils cleanup
EgorkaKulikov Jun 28, 2023
bb112af
Still use CgGetJavaClass where required
EgorkaKulikov Jun 28, 2023
9f9097c
Fix UI bug
EgorkaKulikov Jun 28, 2023
9e96ac9
Fix Python module compilation
EgorkaKulikov Jun 28, 2023
e8ff659
Fix Js module compilation
EgorkaKulikov Jun 28, 2023
647d543
Fix
EgorkaKulikov Jun 28, 2023
d71a7f7
Revert most changes for CgGetJavaClass
EgorkaKulikov Jun 28, 2023
219aa94
Style corrections
EgorkaKulikov Jun 28, 2023
1ed13b1
Style corrections
EgorkaKulikov Jun 28, 2023
517dc1f
Avoid Spring annotation in base class
EgorkaKulikov Jun 28, 2023
d47eba4
Small fix
EgorkaKulikov Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SpringModelUtils cleanup
  • Loading branch information
@EgorkaKulikov
EgorkaKulikov committed Jun 28, 2023
commit 7cb15f29cd969ba93d5107c1f9930292c9e8eed2
3 changes: 2 additions & 1 deletion utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/SpringModelUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ object SpringModelUtils {
val springExtensionClassId = ClassId("org.springframework.test.context.junit.jupiter.SpringExtension")

val bootstrapWithClassId = ClassId("org.springframework.test.context.BootstrapWith")
val springBootTestContextBootstrapper = ClassId("org.springframework.boot.test.context.SpringBootTestContextBootstrapper")
val springBootTestContextBootstrapperClassId =
ClassId("org.springframework.boot.test.context.SpringBootTestContextBootstrapper")


// most likely only one persistent library is on the classpath, but we need to be able to work with either of them
Expand Down
6 changes: 2 additions & 4 deletions ...c/main/kotlin/org/utbot/framework/codegen/tree/CgSpringIntegrationTestClassConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.utbot.framework.plugin.api.util.SpringModelUtils.autowiredClassId
import org.utbot.framework.plugin.api.util.SpringModelUtils.bootstrapWithClassId
import org.utbot.framework.plugin.api.util.SpringModelUtils.dirtiesContextClassId
import org.utbot.framework.plugin.api.util.SpringModelUtils.dirtiesContextClassModeClassId
import org.utbot.framework.plugin.api.util.SpringModelUtils.springBootTestContextBootstrapper
import org.utbot.framework.plugin.api.util.SpringModelUtils.springBootTestContextBootstrapperClassId
import org.utbot.framework.plugin.api.util.SpringModelUtils.transactionalClassId
import org.utbot.framework.plugin.api.util.utContext

Expand All @@ -29,9 +29,7 @@ class CgSpringIntegrationTestClassConstructor(context: CgContext) : CgAbstractSp

private fun collectSpringSpecificAnnotations() {
testFrameworkManager.addAnnotationForSpringRunner()
if (annotationTypeIsAccessible(bootstrapWithClassId)) {
addAnnotation(bootstrapWithClassId, createGetClassExpression(springBootTestContextBootstrapper), Class)
}
addAnnotation(bootstrapWithClassId, createGetClassExpression(springBootTestContextBootstrapperClassId), Class)

addAnnotation(
classId = dirtiesContextClassId,
Expand Down