Skip to content

Commit d329c7d

Browse files
IlyaMuravjovIlyaMuravjov
committed
Move SpringModule from utbot-framework to utbot-spring-framework 
1 parent 3f543d8 commit d329c7d

File tree

4 files changed

+91
-88
lines changed

4 files changed

+91
-88
lines changed

‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/Domain.kt

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -711,32 +711,6 @@ enum class ProjectType {
711711
JavaScript,
712712
}
713713

714-
abstract class SpringModule(
715-
val testFrameworkDisplayName: String,
716-
/**
717-
* Generation Spring specific tests requires special spring test framework being installed,
718-
* so we can use `TestContextManager` from `spring-test` to configure test context in
719-
* spring-analyzer and to run integration tests.
720-
*/
721-
var testFrameworkInstalled: Boolean = false
722-
) {
723-
var isInstalled = false
724-
725-
companion object {
726-
val allItems: List<SpringModule> get() = listOf(SpringBoot, SpringBeans)
727-
728-
val installedItems get() = allItems.filter { it.isInstalled }
729-
}
730-
}
731-
732-
object SpringBeans : SpringModule(
733-
testFrameworkDisplayName = "spring-test",
734-
)
735-
736-
object SpringBoot : SpringModule(
737-
testFrameworkDisplayName = "spring-boot-test",
738-
)
739-
740714
/**
741715
* Extended [UtModel] model with testSet id and execution id.
742716
*

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

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package org.utbot.framework.plugin.api.utils
22

3-
import org.utbot.framework.codegen.domain.SpringModule
43
import org.utbot.framework.codegen.domain.Junit4
54
import org.utbot.framework.codegen.domain.Junit5
6-
import org.utbot.framework.codegen.domain.SpringBeans
7-
import org.utbot.framework.codegen.domain.SpringBoot
85
import org.utbot.framework.codegen.domain.TestFramework
96
import org.utbot.framework.codegen.domain.TestNg
107
import org.utbot.framework.plugin.api.MockFramework
@@ -61,36 +58,6 @@ fun MockFramework.patterns(): Patterns {
6158
return Patterns(moduleLibraryPatterns, libraryPatterns)
6259
}
6360

64-
fun SpringModule.patterns(): Patterns {
65-
val moduleLibraryPatterns = when (this) {
66-
SpringBoot -> springBootModulePatterns
67-
SpringBeans -> springBeansModulePatterns
68-
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
69-
}
70-
val libraryPatterns = when (this) {
71-
SpringBoot -> springBootPatterns
72-
SpringBeans -> springBeansPatterns
73-
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
74-
}
75-
76-
return Patterns(moduleLibraryPatterns, libraryPatterns)
77-
}
78-
79-
fun SpringModule.testPatterns(): Patterns {
80-
val moduleLibraryPatterns = when (this) {
81-
SpringBoot -> springBootTestModulePatterns
82-
SpringBeans -> springBeansTestModulePatterns
83-
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
84-
}
85-
val libraryPatterns = when (this) {
86-
SpringBoot -> springBootTestPatterns
87-
SpringBeans -> springBeansTestPatterns
88-
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
89-
}
90-
91-
return Patterns(moduleLibraryPatterns, libraryPatterns)
92-
}
93-
9461
val JUNIT_4_JAR_PATTERN = Regex("junit-4(\\.1[2-9])(\\.[0-9]+)?")
9562
val JUNIT_4_MVN_PATTERN = Regex("junit:junit:4(\\.1[2-9])(\\.[0-9]+)?")
9663
val junit4Patterns = listOf(JUNIT_4_JAR_PATTERN, JUNIT_4_MVN_PATTERN)
@@ -127,32 +94,3 @@ val mockitoModulePatterns = listOf(MOCKITO_BASIC_MODULE_PATTERN)
12794
const val MOCKITO_EXTENSIONS_FOLDER = "mockito-extensions"
12895
const val MOCKITO_MOCKMAKER_FILE_NAME = "org.mockito.plugins.MockMaker"
12996
val MOCKITO_EXTENSIONS_FILE_CONTENT = "mock-maker-inline"
130-
131-
val SPRING_BEANS_JAR_PATTERN = Regex("spring-beans-([0-9]+)(\\.[0-9]+){1,2}")
132-
val SPRING_BEANS_MVN_PATTERN = Regex("org\\.springframework:spring-beans:([0-9]+)(\\.[0-9]+){1,2}")
133-
val springBeansPatterns = listOf(SPRING_BEANS_JAR_PATTERN, SPRING_BEANS_MVN_PATTERN)
134-
135-
val SPRING_BEANS_BASIC_MODULE_PATTERN = Regex("spring-beans")
136-
val springBeansModulePatterns = listOf(SPRING_BEANS_BASIC_MODULE_PATTERN)
137-
138-
val SPRING_BEANS_TEST_JAR_PATTERN = Regex("spring-test-([0-9]+)(\\.[0-9]+){1,2}")
139-
val SPRING_BEANS_TEST_MVN_PATTERN = Regex("org\\.springframework:spring-test:([0-9]+)(\\.[0-9]+){1,2}")
140-
val springBeansTestPatterns = listOf(SPRING_BEANS_TEST_JAR_PATTERN, SPRING_BEANS_TEST_MVN_PATTERN)
141-
142-
val SPRING_BEANS_TEST_BASIC_MODULE_PATTERN = Regex("spring-test")
143-
val springBeansTestModulePatterns = listOf(SPRING_BEANS_TEST_BASIC_MODULE_PATTERN)
144-
145-
val SPRING_BOOT_JAR_PATTERN = Regex("spring-boot-([0-9]+)(\\.[0-9]+){1,2}")
146-
val SPRING_BOOT_MVN_PATTERN = Regex("org\\.springframework\\.boot:spring-boot:([0-9]+)(\\.[0-9]+){1,2}")
147-
val springBootPatterns = listOf(SPRING_BOOT_JAR_PATTERN, SPRING_BOOT_MVN_PATTERN)
148-
149-
val SPRING_BOOT_BASIC_MODULE_PATTERN = Regex("spring-boot")
150-
val springBootModulePatterns = listOf(SPRING_BOOT_BASIC_MODULE_PATTERN)
151-
152-
val SPRING_BOOT_TEST_JAR_PATTERN = Regex("spring-boot-test-([0-9]+)(\\.[0-9]+){1,2}")
153-
val SPRING_BOOT_TEST_MVN_PATTERN = Regex("org\\.springframework\\.boot:spring-boot-test:([0-9]+)(\\.[0-9]+){1,2}")
154-
155-
val springBootTestPatterns = listOf(SPRING_BOOT_TEST_JAR_PATTERN, SPRING_BOOT_TEST_MVN_PATTERN)
156-
157-
val SPRING_BOOT_TEST_BASIC_MODULE_PATTERN = Regex("spring-boot-test")
158-
val springBootTestModulePatterns = listOf(SPRING_BOOT_TEST_BASIC_MODULE_PATTERN)

‎utbot-spring-framework/src/main/kotlin/org/utbot/framework/codegen/domain/SpringModule.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package org.utbot.framework.codegen.domain
2+
3+
abstract class SpringModule(
4+
val testFrameworkDisplayName: String,
5+
/**
6+
* Generation Spring specific tests requires special spring test framework being installed,
7+
* so we can use `TestContextManager` from `spring-test` to configure test context in
8+
* spring-analyzer and to run integration tests.
9+
*/
10+
var testFrameworkInstalled: Boolean = false
11+
) {
12+
var isInstalled = false
13+
14+
companion object {
15+
val allItems: List<SpringModule> get() = listOf(SpringBoot, SpringBeans)
16+
17+
val installedItems get() = allItems.filter { it.isInstalled }
18+
}
19+
}
20+
21+
object SpringBeans : SpringModule(
22+
testFrameworkDisplayName = "spring-test",
23+
)
24+
25+
object SpringBoot : SpringModule(
26+
testFrameworkDisplayName = "spring-boot-test",
27+
)

‎utbot-spring-framework/src/main/kotlin/org/utbot/framework/plugin/api/utils/SpringDependencyPatterns.kt

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package org.utbot.framework.plugin.api.utils
2+
3+
import org.utbot.framework.codegen.domain.SpringBeans
4+
import org.utbot.framework.codegen.domain.SpringBoot
5+
import org.utbot.framework.codegen.domain.SpringModule
6+
7+
fun SpringModule.patterns(): Patterns {
8+
val moduleLibraryPatterns = when (this) {
9+
SpringBoot -> springBootModulePatterns
10+
SpringBeans -> springBeansModulePatterns
11+
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
12+
}
13+
val libraryPatterns = when (this) {
14+
SpringBoot -> springBootPatterns
15+
SpringBeans -> springBeansPatterns
16+
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
17+
}
18+
19+
return Patterns(moduleLibraryPatterns, libraryPatterns)
20+
}
21+
22+
fun SpringModule.testPatterns(): Patterns {
23+
val moduleLibraryPatterns = when (this) {
24+
SpringBoot -> springBootTestModulePatterns
25+
SpringBeans -> springBeansTestModulePatterns
26+
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
27+
}
28+
val libraryPatterns = when (this) {
29+
SpringBoot -> springBootTestPatterns
30+
SpringBeans -> springBeansTestPatterns
31+
else -> throw UnsupportedOperationException("Unknown dependency injection framework $this")
32+
}
33+
34+
return Patterns(moduleLibraryPatterns, libraryPatterns)
35+
}
36+
37+
val SPRING_BEANS_JAR_PATTERN = Regex("spring-beans-([0-9]+)(\\.[0-9]+){1,2}")
38+
val SPRING_BEANS_MVN_PATTERN = Regex("org\\.springframework:spring-beans:([0-9]+)(\\.[0-9]+){1,2}")
39+
val springBeansPatterns = listOf(SPRING_BEANS_JAR_PATTERN, SPRING_BEANS_MVN_PATTERN)
40+
41+
val SPRING_BEANS_BASIC_MODULE_PATTERN = Regex("spring-beans")
42+
val springBeansModulePatterns = listOf(SPRING_BEANS_BASIC_MODULE_PATTERN)
43+
44+
val SPRING_BEANS_TEST_JAR_PATTERN = Regex("spring-test-([0-9]+)(\\.[0-9]+){1,2}")
45+
val SPRING_BEANS_TEST_MVN_PATTERN = Regex("org\\.springframework:spring-test:([0-9]+)(\\.[0-9]+){1,2}")
46+
val springBeansTestPatterns = listOf(SPRING_BEANS_TEST_JAR_PATTERN, SPRING_BEANS_TEST_MVN_PATTERN)
47+
48+
val SPRING_BEANS_TEST_BASIC_MODULE_PATTERN = Regex("spring-test")
49+
val springBeansTestModulePatterns = listOf(SPRING_BEANS_TEST_BASIC_MODULE_PATTERN)
50+
51+
val SPRING_BOOT_JAR_PATTERN = Regex("spring-boot-([0-9]+)(\\.[0-9]+){1,2}")
52+
val SPRING_BOOT_MVN_PATTERN = Regex("org\\.springframework\\.boot:spring-boot:([0-9]+)(\\.[0-9]+){1,2}")
53+
val springBootPatterns = listOf(SPRING_BOOT_JAR_PATTERN, SPRING_BOOT_MVN_PATTERN)
54+
55+
val SPRING_BOOT_BASIC_MODULE_PATTERN = Regex("spring-boot")
56+
val springBootModulePatterns = listOf(SPRING_BOOT_BASIC_MODULE_PATTERN)
57+
58+
val SPRING_BOOT_TEST_JAR_PATTERN = Regex("spring-boot-test-([0-9]+)(\\.[0-9]+){1,2}")
59+
val SPRING_BOOT_TEST_MVN_PATTERN = Regex("org\\.springframework\\.boot:spring-boot-test:([0-9]+)(\\.[0-9]+){1,2}")
60+
61+
val springBootTestPatterns = listOf(SPRING_BOOT_TEST_JAR_PATTERN, SPRING_BOOT_TEST_MVN_PATTERN)
62+
63+
val SPRING_BOOT_TEST_BASIC_MODULE_PATTERN = Regex("spring-boot-test")
64+
val springBootTestModulePatterns = listOf(SPRING_BOOT_TEST_BASIC_MODULE_PATTERN)

0 commit comments

Comments
 (0)