Skip to content

Locate inner classes tests in outer test class if JUnit4 is used #1674

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 3 commits into from
Jan 16, 2023
Merged

Locate inner classes tests in outer test class if JUnit4 is used #1674

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d03b1c2
Run all tests in outer classes with JUnit4
EgorkaKulikov Jan 16, 2023
87ad14c
Possible fix for a bug with DeepNested
EgorkaKulikov Jan 16, 2023
9af1316
Merge branch 'main' into egor/junit4_nested
EgorkaKulikov Jan 16, 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
Possible fix for a bug with DeepNested
  • Loading branch information
@EgorkaKulikov
EgorkaKulikov committed Jan 16, 2023
commit 87ad14ce6816b1f8ee30d1fbd915f0bb6f9e737e
11 changes: 10 additions & 1 deletion utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgTestClassConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ open class CgTestClassConstructor(val context: CgContext) :
// or https://stackoverflow.com/questions/28230277/test-cases-in-inner-class-and-outer-class-with-junit4
when (testFramework) {
Junit4 -> {
notYetConstructedTestSets += nestedClass.methodTestSets
notYetConstructedTestSets += collectTestSetsFromInnerClasses(nestedClass)
}
Junit5,
TestNg -> {
Expand Down Expand Up @@ -171,6 +171,15 @@ open class CgTestClassConstructor(val context: CgContext) :
return if (regions.any()) regions else null
}

private fun collectTestSetsFromInnerClasses(model: TestClassModel): List<CgMethodTestSet> {
val testSets = model.methodTestSets.toMutableList()
for (nestedClass in model.nestedClasses) {
testSets += collectTestSetsFromInnerClasses(nestedClass)
}

return testSets
}

private fun processFailure(testSet: CgMethodTestSet, failure: Throwable) {
codeGenerationErrors
.getOrPut(testSet) { mutableMapOf() }
Expand Down