Skip to content

Fix Mockito version update #2730

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
merged 1 commit into from
Dec 21, 2023
Merged

Fix Mockito version update #2730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/utils/DependencyPatterns.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ fun MockFramework.patterns(): Patterns {
return Patterns(moduleLibraryPatterns, libraryPatterns)
}

fun MockFramework.manifestPatterns(): Patterns {
val moduleLibraryPatterns = when (this) {
MockFramework.MOCKITO -> mockitoManifestPatterns
}
val libraryPatterns = when (this) {
MockFramework.MOCKITO -> mockitoManifestPatterns
}
return Patterns(moduleLibraryPatterns, libraryPatterns)
}

val JUNIT_4_JAR_PATTERN = Regex("junit-4(\\.1[2-9])(\\.[0-9]+)?")
val JUNIT_4_MVN_PATTERN = Regex("junit:junit:4(\\.1[2-9])(\\.[0-9]+)?")
val junit4Patterns = listOf(JUNIT_4_JAR_PATTERN, JUNIT_4_MVN_PATTERN)
Expand Down Expand Up @@ -87,9 +97,10 @@ val testNgModulePatterns = listOf(TEST_NG_BASIC_MODULE_PATTERN)
val MOCKITO_JAR_PATTERN = Regex("mockito-core-[3-9](\\.[0-9]+){2}")
val MOCKITO_MVN_PATTERN = Regex("org\\.mockito:mockito-core:[3-9](\\.[0-9]+){2}")
val mockitoPatterns = listOf(MOCKITO_JAR_PATTERN, MOCKITO_MVN_PATTERN)
val mockitoModulePatterns = listOf(MOCKITO_JAR_PATTERN, MOCKITO_MVN_PATTERN)

val MOCKITO_BASIC_MODULE_PATTERN = Regex("mockito-core")
val mockitoModulePatterns = listOf(MOCKITO_BASIC_MODULE_PATTERN)
val MOCKITO_MANIFEST_PATTERN = Regex("mockito-core")
val mockitoManifestPatterns = listOf(MOCKITO_MANIFEST_PATTERN)

const val MOCKITO_EXTENSIONS_FOLDER = "mockito-extensions"
const val MOCKITO_MOCKMAKER_FILE_NAME = "org.mockito.plugins.MockMaker"
Expand Down
2 changes: 1 addition & 1 deletion utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/utils/DependencyUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fun checkFrameworkDependencies(dependencyPaths: String?) {
// )
// }

val mockFrameworkPatterns = MockFramework.allItems.map { it.patterns() }
val mockFrameworkPatterns = MockFramework.allItems.map { it.manifestPatterns() }
val mockFrameworkFound = dependencyNames.matchesAnyOf(mockFrameworkPatterns) ||
dependencyPathsSequence.any { checkDependencyIsFatJar(it) }

Expand Down