[WIP] Coverage buttons rework

Author: rudolf101

gradle.properties

@@ -1,26 +1,19 @@
 kotlin.code.style=official
-
 # IU, IC, PC, PY
 # IC for AndroidStudio
-ideType=IC
+ideType=IU
 ideVersion=222.4167.29
-
 pythonIde=IC,IU,PC,PY
 jsIde=IU,PY,WS
 goIde=IU
-
 # In order to run Android Studion instead of Intellij Community, specify the path to your Android Studio installation
 #androidStudioPath=your_path_to_android_studio
-
 #Version numbers: https://plugins.jetbrains.com/plugin/631-python/versions
 pythonCommunityPluginVersion=222.4167.37
 pythonUltimatePluginVersion=222.4167.37
-
 # Version numbers: https://plugins.jetbrains.com/plugin/9568-go/versions
 goPluginVersion=222.4167.21
-
 kotlinPluginVersion=222-1.7.20-release-201-IJ4167.29
-
 junit5Version=5.8.0-RC1
 junit4Version=4.13.2
 junit4PlatformVersion=1.9.0
@@ -60,8 +53,8 @@ kryoSerializersVersion=0.45
 asmVersion=9.2
 testNgVersion=7.6.0
 mockitoInlineVersion=4.0.0
-kamlVersion = 0.51.0
-jacksonVersion = 2.12.3
+kamlVersion=0.51.0
+jacksonVersion=2.12.3
 javasmtSolverZ3Version=4.8.9-sosy1
 slf4jVersion=1.7.36
 eclipseAetherVersion=1.1.0
@@ -78,7 +71,6 @@ pytorchNativeVersion=1.9.1
 shadowJarVersion=7.1.2
 openblasVersion=0.3.10-1.5.4
 arpackNgVersion=3.7.0-1.5.4
-
 # configuration for build server
 #
 # the following options are passed to gradle command explicitly (see appropriate workflow):
@@ -87,7 +79,6 @@ arpackNgVersion=3.7.0-1.5.4
 #
 # read about options precedence at: https://docs.gradle.org/current/userguide/build_environment.html
 org.gradle.jvmargs="-Xmx6g"
-
 # configuration for local compilation - much faster
 # overriden by some parameters in CI, read below about each option
 #

utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt

@@ -2,19 +2,21 @@ package org.utbot.intellij.plugin.language.js
 
 import service.CoverageMode
 import javax.swing.ButtonGroup
-import javax.swing.JRadioButton
+import javax.swing.JToggleButton
 
 object CoverageModeButtons {
 
     var mode = CoverageMode.FAST
 
-    val fastButton = JRadioButton("Fast")
-    val baseButton = JRadioButton("Basic")
-
+    val fastButton = JToggleButton("Fast").apply { this.isSelected = true }
+    val baseButton = JToggleButton("Basic")
+    val buttonGroup = ButtonGroup().apply {
+        this.add(fastButton)
+        this.add(baseButton)
+        this.setSelected(fastButton.model, true)
+    }
 
     init {
-        val buttonGroup = ButtonGroup()
-        fastButton.isSelected = true
         val baseButtonModel = baseButton.model
         baseButtonModel.addChangeListener {
             if (baseButtonModel.isPressed) {
@@ -27,7 +29,5 @@ object CoverageModeButtons {
                 mode = CoverageMode.FAST
             }
         }
-        buttonGroup.add(fastButton)
-        buttonGroup.add(baseButton)
     }
 }

utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt

@@ -2,7 +2,6 @@ package org.utbot.intellij.plugin.language.js
 
 import com.intellij.lang.javascript.refactoring.ui.JSMemberSelectionTable
 import com.intellij.lang.javascript.refactoring.util.JSMemberInfo
-import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.Messages
@@ -11,18 +10,15 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.ui.ContextHelpLabel
 import com.intellij.ui.JBIntSpinner
-import com.intellij.ui.components.Panel
+import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.layout.Cell
-import com.intellij.ui.layout.panel
 import com.intellij.util.ui.JBUI
 import framework.codegen.Mocha
-import org.utbot.framework.plugin.api.CodeGenerationSettingItem
+import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.intellij.plugin.ui.components.TestSourceDirectoryChooser
 import settings.JsTestGenerationSettings.defaultTimeout
-import java.awt.BorderLayout
 import java.io.File
 import java.nio.file.Paths
-import javax.swing.DefaultComboBoxModel
 import javax.swing.JComboBox
 import javax.swing.JComponent
 
@@ -36,7 +32,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {
     }
 
     private val testSourceFolderField = TestSourceDirectoryChooser(model, model.file.virtualFile)
-    private val testFrameworks = ComboBox(DefaultComboBoxModel(arrayOf(Mocha)))
+    private val testFrameworks = listOf<TestFramework>(Mocha)
     private val nycSourceFileChooserField = NycSourceFileChooser(model)
     private val coverageMode = CoverageModeButtons
 
@@ -62,34 +58,28 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {
     override fun createCenterPanel(): JComponent {
         panel = panel {
             row("Test source root:") {
-                component(testSourceFolderField)
+                cell(testSourceFolderField)
             }
             row("Test framework:") {
-                component(
-                    Panel().apply {
-                        add(testFrameworks as ComboBox<CodeGenerationSettingItem>, BorderLayout.LINE_START)
-                    }
-                )
+                comboBox(testFrameworks, null)
             }
             row("Nyc source path:") {
-                component(nycSourceFileChooserField)
+                cell(nycSourceFileChooserField)
             }
             row("Coverage mode:") {
-                coverageMode.fastButton()
-                coverageMode.baseButton()
+                cell(coverageMode.fastButton).apply { this.component.isSelected == true }
+                cell(coverageMode.baseButton)
 //                panelWithHelpTooltip("Fast mode can't find timeouts, but works faster") {
 //                    component(coverageMode.fastButton, coverageMode.baseButton)
 //                    component(coverageMode.baseButton)
 //                }
             }
             row("Timeout for Node.js (in seconds):") {
-                panelWithHelpTooltip("The execution timeout") {
-                    component(timeoutSpinner)
-                }
+                cell(timeoutSpinner)
             }
             row("Generate test methods for:") {}
             row {
-                scrollPane(functionsTable)
+                scrollCell(functionsTable)
             }
         }
         updateMembersTable()
@@ -108,7 +98,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {
     override fun doOKAction() {
         val selected = functionsTable.selectedMemberInfos.toSet()
         model.selectedMethods = if (selected.any()) selected else emptySet()
-        model.testFramework = testFrameworks.item
+        model.testFramework = testFrameworks
         model.timeout = timeoutSpinner.number.toLong()
         model.pathToNYC = nycSourceFileChooserField.text
         model.coverageMode = coverageMode.mode