From d6f5dc92359136fc0cca47a6f04c9dc3c74334c7 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Fri, 17 Feb 2023 16:00:27 +0300 Subject: [PATCH 1/7] Change coverage buttons to toggle buttons --- .../plugin/language/js/CoverageModeButtons.kt | 13 ++++++++++--- .../plugin/language/js/JsDialogWindow.kt | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt index a372deb8b7..f44ca170d7 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt @@ -1,15 +1,20 @@ package org.utbot.intellij.plugin.language.js import service.CoverageMode -import javax.swing.JToggleButton +import javax.swing.ButtonGroup +import javax.swing.JRadioButton object CoverageModeButtons { var mode = CoverageMode.FAST - val baseButton = JToggleButton("Basic") - val fastButton = JToggleButton("Fast") + + val fastButton = JRadioButton("Fast") + val baseButton = JRadioButton("Basic") + init { + val buttonGroup = ButtonGroup() + fastButton.isSelected = true val baseButtonModel = baseButton.model baseButtonModel.addChangeListener { if (baseButtonModel.isPressed) { @@ -22,5 +27,7 @@ object CoverageModeButtons { mode = CoverageMode.FAST } } + buttonGroup.add(fastButton) + buttonGroup.add(baseButton) } } diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt index fcf6eb3700..18ca9cf20e 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt @@ -11,21 +11,20 @@ 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.JBLabel import com.intellij.ui.components.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.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 -import org.utbot.framework.plugin.api.CodeGenerationSettingItem -import org.utbot.intellij.plugin.ui.components.TestSourceDirectoryChooser -import settings.JsTestGenerationSettings.defaultTimeout class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { @@ -53,6 +52,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { init { title = "Generate Tests with UtBot" + super.setOKButtonText("Generate Tests") isResizable = false init() } @@ -75,15 +75,16 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { component(nycSourceFileChooserField) } row("Coverage mode:") { - panelWithHelpTooltip("Fast mode can't find timeouts, but works faster") { - component(coverageMode.fastButton) - component(coverageMode.baseButton) - } + coverageMode.fastButton() + 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) - component(JBLabel("sec")) } } row("Generate test methods for:") {} From 2a9efafe158825ef016abdea8b1879cdab066a76 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Mon, 20 Feb 2023 15:38:29 +0300 Subject: [PATCH 2/7] [WIP] Coverage buttons rework --- gradle.properties | 15 ++------- .../plugin/language/js/CoverageModeButtons.kt | 16 +++++----- .../plugin/language/js/JsDialogWindow.kt | 32 +++++++------------ 3 files changed, 22 insertions(+), 41 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5525b6883f..74a8a106ef 100644 --- a/gradle.properties +++ b/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 # diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt index f44ca170d7..70c7245e23 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt +++ b/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) } } diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt index 18ca9cf20e..55eebc21be 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt +++ b/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(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, 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 From f962b1ece4eaf907683bb9d49ff544a7cb3d97a0 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Mon, 27 Feb 2023 14:00:29 +0300 Subject: [PATCH 3/7] Revert "[WIP] Coverage buttons rework" This reverts commit 2a9efafe158825ef016abdea8b1879cdab066a76. --- gradle.properties | 15 +++++++-- .../plugin/language/js/CoverageModeButtons.kt | 16 +++++----- .../plugin/language/js/JsDialogWindow.kt | 32 ++++++++++++------- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index 74a8a106ef..5525b6883f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,26 @@ kotlin.code.style=official + # IU, IC, PC, PY # IC for AndroidStudio -ideType=IU +ideType=IC 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 @@ -53,8 +60,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 @@ -71,6 +78,7 @@ 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): @@ -79,6 +87,7 @@ 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 # diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt index 70c7245e23..f44ca170d7 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/CoverageModeButtons.kt @@ -2,21 +2,19 @@ package org.utbot.intellij.plugin.language.js import service.CoverageMode import javax.swing.ButtonGroup -import javax.swing.JToggleButton +import javax.swing.JRadioButton object CoverageModeButtons { var mode = CoverageMode.FAST - 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) - } + val fastButton = JRadioButton("Fast") + val baseButton = JRadioButton("Basic") + init { + val buttonGroup = ButtonGroup() + fastButton.isSelected = true val baseButtonModel = baseButton.model baseButtonModel.addChangeListener { if (baseButtonModel.isPressed) { @@ -29,5 +27,7 @@ object CoverageModeButtons { mode = CoverageMode.FAST } } + buttonGroup.add(fastButton) + buttonGroup.add(baseButton) } } diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt index 55eebc21be..18ca9cf20e 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt @@ -2,6 +2,7 @@ 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 @@ -10,15 +11,18 @@ 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.dsl.builder.panel +import com.intellij.ui.components.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.codegen.domain.TestFramework +import org.utbot.framework.plugin.api.CodeGenerationSettingItem 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 @@ -32,7 +36,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { } private val testSourceFolderField = TestSourceDirectoryChooser(model, model.file.virtualFile) - private val testFrameworks = listOf(Mocha) + private val testFrameworks = ComboBox(DefaultComboBoxModel(arrayOf(Mocha))) private val nycSourceFileChooserField = NycSourceFileChooser(model) private val coverageMode = CoverageModeButtons @@ -58,28 +62,34 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { override fun createCenterPanel(): JComponent { panel = panel { row("Test source root:") { - cell(testSourceFolderField) + component(testSourceFolderField) } row("Test framework:") { - comboBox(testFrameworks, null) + component( + Panel().apply { + add(testFrameworks as ComboBox, BorderLayout.LINE_START) + } + ) } row("Nyc source path:") { - cell(nycSourceFileChooserField) + component(nycSourceFileChooserField) } row("Coverage mode:") { - cell(coverageMode.fastButton).apply { this.component.isSelected == true } - cell(coverageMode.baseButton) + coverageMode.fastButton() + 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):") { - cell(timeoutSpinner) + panelWithHelpTooltip("The execution timeout") { + component(timeoutSpinner) + } } row("Generate test methods for:") {} row { - scrollCell(functionsTable) + scrollPane(functionsTable) } } updateMembersTable() @@ -98,7 +108,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 + model.testFramework = testFrameworks.item model.timeout = timeoutSpinner.number.toLong() model.pathToNYC = nycSourceFileChooserField.text model.coverageMode = coverageMode.mode From aa9b8bb929f49c756579754dc05d047aafee1c06 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Mon, 27 Feb 2023 14:03:20 +0300 Subject: [PATCH 4/7] Remove gap between coverage buttons --- .../intellij/plugin/language/js/JsDialogWindow.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt index 18ca9cf20e..fdf50f3d1d 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt @@ -75,12 +75,12 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { component(nycSourceFileChooserField) } row("Coverage mode:") { - coverageMode.fastButton() - coverageMode.baseButton() -// panelWithHelpTooltip("Fast mode can't find timeouts, but works faster") { -// component(coverageMode.fastButton, coverageMode.baseButton) -// component(coverageMode.baseButton) -// } + cell { + panelWithHelpTooltip("Fast mode can't find timeouts, but works faster") { + coverageMode.fastButton() + coverageMode.baseButton() + } + } } row("Timeout for Node.js (in seconds):") { panelWithHelpTooltip("The execution timeout") { From 17187abeea5e91ccfdf288ef1001f3d56b772bf0 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Mon, 27 Feb 2023 14:04:38 +0300 Subject: [PATCH 5/7] Expand tooltip text --- .../org/utbot/intellij/plugin/language/js/JsDialogWindow.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt index fdf50f3d1d..a47512bc49 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt @@ -83,7 +83,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { } } row("Timeout for Node.js (in seconds):") { - panelWithHelpTooltip("The execution timeout") { + panelWithHelpTooltip("The execution timeout for each generated test") { component(timeoutSpinner) } } From b55566ee957a329f6088dafb4393a443f74e4338 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Mon, 27 Feb 2023 14:39:33 +0300 Subject: [PATCH 6/7] Fix after merge --- .../codegen/model/constructor/visitor/CgJsRenderer.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt index 58f81bd8b4..45715897df 100644 --- a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt +++ b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt @@ -22,6 +22,7 @@ import org.utbot.framework.codegen.domain.models.CgExpression import org.utbot.framework.codegen.domain.models.CgFieldAccess import org.utbot.framework.codegen.domain.models.CgForLoop import org.utbot.framework.codegen.domain.models.CgFormattedString +import org.utbot.framework.codegen.domain.models.CgFrameworkUtilMethod import org.utbot.framework.codegen.domain.models.CgGetJavaClass import org.utbot.framework.codegen.domain.models.CgGetKotlinClass import org.utbot.framework.codegen.domain.models.CgGetLength @@ -39,7 +40,6 @@ import org.utbot.framework.codegen.domain.models.CgStaticsRegion import org.utbot.framework.codegen.domain.models.CgSwitchCase import org.utbot.framework.codegen.domain.models.CgSwitchCaseLabel import org.utbot.framework.codegen.domain.models.CgTestMethod -import org.utbot.framework.codegen.domain.models.CgThrowStatement import org.utbot.framework.codegen.domain.models.CgTypeCast import org.utbot.framework.codegen.domain.models.CgVariable import org.utbot.framework.codegen.renderer.CgAbstractRenderer @@ -282,10 +282,6 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP visit(element as CgMethod) } - override fun visit(element: CgThrowStatement) { - // TODO: Should we render throw statement right here? - } - override fun visit(element: CgClassBody) { // render regions for test methods for ((i, region) in (element.methodRegions + element.nestedClassRegions).withIndex()) { @@ -415,4 +411,4 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP .replace("$", "\\$") .replace("\\f", "\\u000C") .replace("\\xxx", "\\\u0058\u0058\u0058") -} \ No newline at end of file +} From a46cbbbfdf1a001127a2fe98ed622022004b76ae Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Mon, 27 Feb 2023 17:12:30 +0300 Subject: [PATCH 7/7] Reformulate text of the coverage buttons tooltip --- .../org/utbot/intellij/plugin/language/js/JsDialogWindow.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt index a47512bc49..24d934ada1 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt @@ -76,7 +76,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) { } row("Coverage mode:") { cell { - panelWithHelpTooltip("Fast mode can't find timeouts, but works faster") { + panelWithHelpTooltip("Fast mode does not guarantee proper handling of user timeouts") { coverageMode.fastButton() coverageMode.baseButton() }