@@ -152,8 +152,11 @@ import org.utbot.intellij.plugin.ui.utils.parseVersion
152
152
import org.utbot.intellij.plugin.ui.utils.testResourceRootTypes
153
153
import org.utbot.intellij.plugin.ui.utils.testRootType
154
154
import org.utbot.intellij.plugin.util.IntelliJApiHelper
155
+ import org.utbot.intellij.plugin.util.SpringConfigurationsHelper
155
156
import org.utbot.intellij.plugin.util.extractFirstLevelMembers
156
157
import org.utbot.intellij.plugin.util.findSdkVersion
158
+ import java.awt.Component
159
+ import java.io.File
157
160
import java.time.LocalDateTime
158
161
import java.time.format.DateTimeFormatter
159
162
import java.util.*
@@ -169,6 +172,8 @@ private const val NO_SPRING_CONFIGURATION_OPTION = "No configuration"
169
172
private const val ACTION_GENERATE = " Generate Tests"
170
173
private const val ACTION_GENERATE_AND_RUN = " Generate and Run"
171
174
175
+ private const val JAVA_CONFIG_SEPARATOR = " ."
176
+
172
177
class GenerateTestsDialogWindow (val model : GenerateTestsModel ) : DialogWrapper(model.project) {
173
178
companion object {
174
179
const val minSupportedSdkVersion = 8
@@ -192,12 +197,25 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
192
197
private val codegenLanguages = createComboBox(CodegenLanguage .values())
193
198
private val testFrameworks = createComboBox(TestFramework .allItems.toTypedArray())
194
199
195
- private val modelSpringConfigs = setOf (
200
+ private val shortenedSortedSpringConfigurationClasses =
201
+ SpringConfigurationsHelper .shortenSpringConfigNames(
202
+ model.getSortedSpringConfigurationClasses(),
203
+ JAVA_CONFIG_SEPARATOR
204
+ )
205
+
206
+ private val shortenedSpringXMLConfigurationFiles =
207
+ SpringConfigurationsHelper .shortenSpringConfigNames(
208
+ model.getSpringXMLConfigurationFiles(),
209
+ File .separator
210
+ )
211
+
212
+ private val shortenedSpringConfigNames = setOf (
196
213
null to listOf (NO_SPRING_CONFIGURATION_OPTION ),
197
- " Java-based configurations" to model.getSortedSpringConfigurationClasses() ,
198
- " XML-based configurations" to model.getSpringXMLConfigurationFiles()
214
+ " Java-based configurations" to shortenedSortedSpringConfigurationClasses ,
215
+ " XML-based configurations" to shortenedSpringXMLConfigurationFiles
199
216
)
200
- private val springConfig = createComboBoxWithSeparatorsForSpringConfigs(modelSpringConfigs)
217
+
218
+ private val springConfig = createComboBoxWithSeparatorsForSpringConfigs(shortenedSpringConfigNames)
201
219
202
220
private val mockStrategies = createComboBox(MockStrategyApi .values())
203
221
private val staticsMocking = JCheckBox (" Mock static methods" )
@@ -1116,7 +1134,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
1116
1134
private fun updateSpringConfigurationEnabled () {
1117
1135
// We check for > 1 because there is already extra-dummy NO_SPRING_CONFIGURATION_OPTION option
1118
1136
springConfig.isEnabled = model.projectType == ProjectType .Spring
1119
- && modelSpringConfigs .size > 1
1137
+ && shortenedSpringConfigNames .size > 1
1120
1138
}
1121
1139
1122
1140
private fun staticsMockingConfigured (): Boolean {
0 commit comments