-
Notifications
You must be signed in to change notification settings - Fork 45
Divide Spring unit and integration testing in codegen #2230
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/builtin/SpringBuiltins.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package org.utbot.framework.codegen.domain.builtin | ||
|
|
||
| import org.utbot.framework.plugin.api.BuiltinClassId | ||
|
|
||
| internal val autowiredClassId = BuiltinClassId( | ||
| canonicalName = "org.springframework.beans.factory.annotation", | ||
| simpleName = "Autowired", | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
utbot-framework/src/main/kotlin/org/utbot/framework/codegen/generator/CodeGenerator.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package org.utbot.framework.codegen.generator | ||
|
|
||
| import org.utbot.framework.codegen.domain.ForceStaticMocking | ||
| import org.utbot.framework.codegen.domain.HangingTestsTimeout | ||
| import org.utbot.framework.codegen.domain.ParametrizedTestSource | ||
| import org.utbot.framework.codegen.domain.ProjectType | ||
| import org.utbot.framework.codegen.domain.RuntimeExceptionTestsBehaviour | ||
| import org.utbot.framework.codegen.domain.StaticsMocking | ||
| import org.utbot.framework.codegen.domain.TestFramework | ||
| import org.utbot.framework.codegen.domain.models.CgMethodTestSet | ||
| import org.utbot.framework.codegen.domain.models.builders.SimpleTestClassModelBuilder | ||
| import org.utbot.framework.codegen.services.language.CgLanguageAssistant | ||
| import org.utbot.framework.codegen.tree.CgSimpleTestClassConstructor | ||
| import org.utbot.framework.codegen.tree.ututils.UtilClassKind | ||
| import org.utbot.framework.plugin.api.ClassId | ||
| import org.utbot.framework.plugin.api.CodegenLanguage | ||
| import org.utbot.framework.plugin.api.ExecutableId | ||
| import org.utbot.framework.plugin.api.MockFramework | ||
|
|
||
| open class CodeGenerator( | ||
| val classUnderTest: ClassId, | ||
| val projectType: ProjectType, | ||
| paramNames: MutableMap<ExecutableId, List<String>> = mutableMapOf(), | ||
| generateUtilClassFile: Boolean = false, | ||
| testFramework: TestFramework = TestFramework.defaultItem, | ||
| mockFramework: MockFramework = MockFramework.defaultItem, | ||
| staticsMocking: StaticsMocking = StaticsMocking.defaultItem, | ||
| forceStaticMocking: ForceStaticMocking = ForceStaticMocking.defaultItem, | ||
| generateWarningsForStaticMocking: Boolean = true, | ||
| codegenLanguage: CodegenLanguage = CodegenLanguage.defaultItem, | ||
| cgLanguageAssistant: CgLanguageAssistant = CgLanguageAssistant.getByCodegenLanguage(codegenLanguage), | ||
| parameterizedTestSource: ParametrizedTestSource = ParametrizedTestSource.defaultItem, | ||
| runtimeExceptionTestsBehaviour: RuntimeExceptionTestsBehaviour = RuntimeExceptionTestsBehaviour.defaultItem, | ||
| hangingTestsTimeout: HangingTestsTimeout = HangingTestsTimeout(), | ||
| enableTestsTimeout: Boolean = true, | ||
| testClassPackageName: String = classUnderTest.packageName, | ||
| ): AbstractCodeGenerator( | ||
| classUnderTest, | ||
| projectType, | ||
| paramNames, | ||
| generateUtilClassFile, | ||
| testFramework, | ||
| mockFramework, | ||
| staticsMocking, | ||
| forceStaticMocking, | ||
| generateWarningsForStaticMocking, | ||
| codegenLanguage, | ||
| cgLanguageAssistant, | ||
| parameterizedTestSource, | ||
| runtimeExceptionTestsBehaviour, | ||
| hangingTestsTimeout, | ||
| enableTestsTimeout, | ||
| testClassPackageName, | ||
| ) { | ||
|
|
||
| override fun generate(testSets: List<CgMethodTestSet>): CodeGeneratorResult { | ||
| val testClassModel = SimpleTestClassModelBuilder(context).createTestClassModel(classUnderTest, testSets) | ||
|
|
||
| logger.info { "Code generation phase started at ${now()}" } | ||
| val astConstructor = CgSimpleTestClassConstructor(context) | ||
| val testClassFile = astConstructor.construct(testClassModel) | ||
| logger.info { "Code generation phase finished at ${now()}" } | ||
|
|
||
| val generatedCode = renderToString(testClassFile) | ||
|
|
||
| return CodeGeneratorResult( | ||
| generatedCode = generatedCode, | ||
| utilClassKind = UtilClassKind.fromCgContextOrNull(context), | ||
| testsGenerationReport = astConstructor.testsGenerationReport, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
16 changes: 16 additions & 0 deletions
16
utbot-framework/src/main/kotlin/org/utbot/framework/codegen/generator/CodeGeneratorResult.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package org.utbot.framework.codegen.generator | ||
|
|
||
| import org.utbot.framework.codegen.reports.TestsGenerationReport | ||
| import org.utbot.framework.codegen.tree.ututils.UtilClassKind | ||
|
|
||
| /** | ||
| * @property generatedCode the source code of the test class | ||
| * @property testsGenerationReport some info about test generation process | ||
| * @property utilClassKind the kind of util class if it is required, otherwise - null | ||
| */ | ||
| data class CodeGeneratorResult( | ||
| val generatedCode: String, | ||
| val testsGenerationReport: TestsGenerationReport, | ||
| // null if no util class needed, e.g. when we are generating utils directly into test class | ||
| val utilClassKind: UtilClassKind? = null, | ||
| ) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.