Skip to content

Commit 48b3e3b

Browse files
committed
Support Python more carefully
1 parent d561390 commit 48b3e3b

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/language/python/PythonDialogWindow.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import com.jetbrains.python.refactoring.classes.PyMemberInfoStorage
1515
import com.jetbrains.python.refactoring.classes.membersManager.PyMemberInfo
1616
import com.jetbrains.python.refactoring.classes.ui.PyMemberSelectionTable
1717
import org.utbot.framework.UtSettings
18+
import org.utbot.framework.codegen.domain.ProjectType
1819
import org.utbot.intellij.plugin.settings.Settings
1920
import java.awt.BorderLayout
2021
import java.util.concurrent.TimeUnit
@@ -171,6 +172,7 @@ class PythonDialogWindow(val model: PythonTestsModel) : DialogWrapper(model.proj
171172
model.testFramework = testFrameworks.item
172173
model.timeout = TimeUnit.SECONDS.toMillis(timeoutSpinnerForTotalTimeout.number.toLong())
173174
model.testSourceRootPath = testSourceFolderField.text
175+
model.projectType = ProjectType.PYTHON
174176

175177
val settings = model.project.service<Settings>()
176178
with(settings) {

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/GenerateTestsModel.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import com.intellij.refactoring.util.classMembers.MemberInfo
1818
import org.jetbrains.kotlin.psi.KtFile
1919
import org.utbot.framework.SummariesGenerationType
2020
import org.utbot.framework.UtSettings
21-
import org.utbot.framework.codegen.domain.ProjectType
2221
import org.utbot.framework.codegen.domain.TypeReplacementApproach
2322
import org.utbot.framework.plugin.api.JavaDocCommentStyle
2423
import org.utbot.framework.util.ConflictTriggers
@@ -43,8 +42,6 @@ class GenerateTestsModel(
4342
override var sourceRootHistory = project.service<Settings>().sourceRootHistory
4443
override var codegenLanguage = project.service<Settings>().codegenLanguage
4544

46-
lateinit var projectType: ProjectType
47-
4845
lateinit var testFramework: TestFramework
4946
lateinit var mockStrategy: MockStrategyApi
5047
lateinit var mockFramework: MockFramework

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
526526
model.testSourceRoot?.apply { model.updateSourceRootHistory(this.toNioPath().toString()) }
527527

528528
//TODO: obtain this values from UI controls https://github.com/UnitTestBot/UTBotJava/issues/1929
529-
model.projectType = ProjectType.SPRING
529+
model.projectType = ProjectType.PURE_JVM
530530
model.typeReplacementApproach = TypeReplacementApproach.DO_NOT_REPLACE
531531

532532
val settings = model.project.service<Settings>()

utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/models/BaseTestModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ import com.intellij.openapi.vfs.newvfs.impl.FakeVirtualFile
1010
import com.intellij.psi.JavaPsiFacade
1111
import com.intellij.psi.PsiClass
1212
import com.intellij.psi.search.GlobalSearchScope
13-
import com.intellij.psi.search.ProjectScope
1413
import com.intellij.psi.search.searches.AnnotatedElementsSearch
1514
import org.jetbrains.kotlin.idea.core.getPackage
16-
import org.jetbrains.kotlin.idea.search.allScope
1715
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
1816
import org.jetbrains.kotlin.idea.util.rootManager
1917
import org.jetbrains.kotlin.idea.util.sourceRoot
18+
import org.utbot.framework.codegen.domain.ProjectType
2019
import org.utbot.framework.plugin.api.CodegenLanguage
2120
import org.utbot.intellij.plugin.ui.utils.ITestSourceRoot
2221
import org.utbot.intellij.plugin.ui.utils.getSortedTestRoots
@@ -40,6 +39,7 @@ open class BaseTestsModel(
4039
var testPackageName: String? = null
4140
open var sourceRootHistory : MutableList<String> = mutableListOf()
4241
open lateinit var codegenLanguage: CodegenLanguage
42+
open lateinit var projectType: ProjectType
4343

4444
fun setSourceRootAndFindTestModule(newTestSourceRoot: VirtualFile?) {
4545
requireNotNull(newTestSourceRoot)

0 commit comments

Comments
 (0)