Commit cf1f74f

authored

Refactoring of JavaScript dialog window (#1861)

* Change coverage buttons to toggle buttons * Remove gap between coverage buttons * Expand tooltip text * Reformulate text of the coverage buttons tooltip

1 parent fadba72 commit cf1f74fCopy full SHA for cf1f74f

File tree

2 files changed

+20

-12

lines changed

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

2 files changed

+20

-12

lines changed

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

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,20 @@`
`1`	`1`	`package org.utbot.intellij.plugin.language.js`
`2`	`2`
`3`	`3`	`import service.CoverageMode`
`4`		`-import javax.swing.JToggleButton`
	`4`	`+import javax.swing.ButtonGroup`
	`5`	`+import javax.swing.JRadioButton`
`5`	`6`
`6`	`7`	`object CoverageModeButtons {`
`7`	`8`
`8`	`9`	`var mode = CoverageMode.FAST`
`9`		`- val baseButton = JToggleButton("Basic")`
`10`		`- val fastButton = JToggleButton("Fast")`
	`10`	`+`
	`11`	`+ val fastButton = JRadioButton("Fast")`
	`12`	`+ val baseButton = JRadioButton("Basic")`
	`13`	`+`
`11`	`14`
`12`	`15`	`init {`
	`16`	`+ val buttonGroup = ButtonGroup()`
	`17`	`+ fastButton.isSelected = true`
`13`	`18`	`val baseButtonModel = baseButton.model`
`14`	`19`	`baseButtonModel.addChangeListener {`
`15`	`20`	`if (baseButtonModel.isPressed) {`
`@@ -22,5 +27,7 @@ object CoverageModeButtons {`
`22`	`27`	`mode = CoverageMode.FAST`
`23`	`28`	`}`
`24`	`29`	`}`
	`30`	`+ buttonGroup.add(fastButton)`
	`31`	`+ buttonGroup.add(baseButton)`
`25`	`32`	`}`
`26`	`33`	`}`

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

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,21 +11,20 @@ import com.intellij.openapi.vfs.VirtualFile`
`11`	`11`	`import com.intellij.openapi.vfs.VirtualFileManager`
`12`	`12`	`import com.intellij.ui.ContextHelpLabel`
`13`	`13`	`import com.intellij.ui.JBIntSpinner`
`14`		`-import com.intellij.ui.components.JBLabel`
`15`	`14`	`import com.intellij.ui.components.Panel`
`16`	`15`	`import com.intellij.ui.layout.Cell`
`17`	`16`	`import com.intellij.ui.layout.panel`
`18`	`17`	`import com.intellij.util.ui.JBUI`
`19`	`18`	`import framework.codegen.Mocha`
	`19`	`+import org.utbot.framework.plugin.api.CodeGenerationSettingItem`
	`20`	`+import org.utbot.intellij.plugin.ui.components.TestSourceDirectoryChooser`
	`21`	`+import settings.JsTestGenerationSettings.defaultTimeout`
`20`	`22`	`import java.awt.BorderLayout`
`21`	`23`	`import java.io.File`
`22`	`24`	`import java.nio.file.Paths`
`23`	`25`	`import javax.swing.DefaultComboBoxModel`
`24`	`26`	`import javax.swing.JComboBox`
`25`	`27`	`import javax.swing.JComponent`
`26`		`-import org.utbot.framework.plugin.api.CodeGenerationSettingItem`
`27`		`-import org.utbot.intellij.plugin.ui.components.TestSourceDirectoryChooser`
`28`		`-import settings.JsTestGenerationSettings.defaultTimeout`
`29`	`28`
`30`	`29`	`class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {`
`31`	`30`
`@@ -53,6 +52,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {`
`53`	`52`
`54`	`53`	`init {`
`55`	`54`	`title = "Generate Tests with UtBot"`
	`55`	`+ super.setOKButtonText("Generate Tests")`
`56`	`56`	`isResizable = false`
`57`	`57`	`init()`
`58`	`58`	`}`
`@@ -75,15 +75,16 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {`
`75`	`75`	`component(nycSourceFileChooserField)`
`76`	`76`	`}`
`77`	`77`	`row("Coverage mode:") {`
`78`		`- panelWithHelpTooltip("Fast mode can't find timeouts, but works faster") {`
`79`		`- component(coverageMode.fastButton)`
`80`		`- component(coverageMode.baseButton)`
	`78`	`+ cell {`
	`79`	`+ panelWithHelpTooltip("Fast mode does not guarantee proper handling of user timeouts") {`
	`80`	`+ coverageMode.fastButton()`
	`81`	`+ coverageMode.baseButton()`
	`82`	`+ }`
`81`	`83`	`}`
`82`	`84`	`}`
`83`	`85`	`row("Timeout for Node.js (in seconds):") {`
`84`		`- panelWithHelpTooltip("The execution timeout") {`
	`86`	`+ panelWithHelpTooltip("The execution timeout for each generated test") {`
`85`	`87`	`component(timeoutSpinner)`
`86`		`- component(JBLabel("sec"))`
`87`	`88`	`}`
`88`	`89`	`}`
`89`	`90`	`row("Generate test methods for:") {}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit cf1f74f

File tree

2 files changed

2 files changed

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

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

0 commit comments