Skip to content

Commit c0235d4

Browse files
authored
Fix Mockito version update (#2730)
1 parent ae31017 commit c0235d4

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/utils/DependencyPatterns.kt

+13-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ fun MockFramework.patterns(): Patterns {
5858
return Patterns(moduleLibraryPatterns, libraryPatterns)
5959
}
6060

61+
fun MockFramework.manifestPatterns(): Patterns {
62+
val moduleLibraryPatterns = when (this) {
63+
MockFramework.MOCKITO -> mockitoManifestPatterns
64+
}
65+
val libraryPatterns = when (this) {
66+
MockFramework.MOCKITO -> mockitoManifestPatterns
67+
}
68+
return Patterns(moduleLibraryPatterns, libraryPatterns)
69+
}
70+
6171
val JUNIT_4_JAR_PATTERN = Regex("junit-4(\\.1[2-9])(\\.[0-9]+)?")
6272
val JUNIT_4_MVN_PATTERN = Regex("junit:junit:4(\\.1[2-9])(\\.[0-9]+)?")
6373
val junit4Patterns = listOf(JUNIT_4_JAR_PATTERN, JUNIT_4_MVN_PATTERN)
@@ -87,9 +97,10 @@ val testNgModulePatterns = listOf(TEST_NG_BASIC_MODULE_PATTERN)
8797
val MOCKITO_JAR_PATTERN = Regex("mockito-core-[3-9](\\.[0-9]+){2}")
8898
val MOCKITO_MVN_PATTERN = Regex("org\\.mockito:mockito-core:[3-9](\\.[0-9]+){2}")
8999
val mockitoPatterns = listOf(MOCKITO_JAR_PATTERN, MOCKITO_MVN_PATTERN)
100+
val mockitoModulePatterns = listOf(MOCKITO_JAR_PATTERN, MOCKITO_MVN_PATTERN)
90101

91-
val MOCKITO_BASIC_MODULE_PATTERN = Regex("mockito-core")
92-
val mockitoModulePatterns = listOf(MOCKITO_BASIC_MODULE_PATTERN)
102+
val MOCKITO_MANIFEST_PATTERN = Regex("mockito-core")
103+
val mockitoManifestPatterns = listOf(MOCKITO_MANIFEST_PATTERN)
93104

94105
const val MOCKITO_EXTENSIONS_FOLDER = "mockito-extensions"
95106
const val MOCKITO_MOCKMAKER_FILE_NAME = "org.mockito.plugins.MockMaker"

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/utils/DependencyUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fun checkFrameworkDependencies(dependencyPaths: String?) {
4343
// )
4444
// }
4545

46-
val mockFrameworkPatterns = MockFramework.allItems.map { it.patterns() }
46+
val mockFrameworkPatterns = MockFramework.allItems.map { it.manifestPatterns() }
4747
val mockFrameworkFound = dependencyNames.matchesAnyOf(mockFrameworkPatterns) ||
4848
dependencyPathsSequence.any { checkDependencyIsFatJar(it) }
4949

0 commit comments

Comments
 (0)