Merge pull request #354 from JetBrains-Research/arksap2002/bugs/disab…

…le-buttons-during-tests-excecution Disable buttons during tests running
JetBrains-Research · Sep 19, 2024 · 2ba7d66 · 2ba7d66
2 parents 89a07e0 + f067565
commit 2ba7d66
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 20 deletions.
diff --git a/...otlin/org/jetbrains/research/testspark/display/generatedTests/GeneratedTestsTabBuilder.kt b/...otlin/org/jetbrains/research/testspark/display/generatedTests/GeneratedTestsTabBuilder.kt
@@ -19,7 +19,6 @@ import java.awt.BorderLayout
 import java.awt.Dimension
 import javax.swing.Box
 import javax.swing.BoxLayout
-import javax.swing.JButton
 import javax.swing.JCheckBox
 import javax.swing.JPanel
 import javax.swing.JSeparator
@@ -41,15 +40,13 @@ class GeneratedTestsTabBuilder(
 
     private var mainPanel: JPanel = JPanel()
 
-    private val applyButton = JButton(PluginLabelsBundle.get("applyButton"))
-
     private var displayUtils: DisplayUtils? = null
 
     fun generatedTestsTabData() = generatedTestsTabData
 
     fun getRemoveAllButton() = generatedTestsTabData.topButtonsPanelBuilder.getRemoveAllButton()
 
-    fun getApplyButton() = applyButton
+    fun getApplyButton() = generatedTestsTabData.applyButton
 
     /**
      * Displays the generated tests tab in the tool window.
@@ -102,10 +99,10 @@ class GeneratedTestsTabBuilder(
             BorderLayout.NORTH,
         )
         mainPanel.add(generatedTestsTabData.scrollPane, BorderLayout.CENTER)
-        mainPanel.add(applyButton, BorderLayout.SOUTH)
+        mainPanel.add(generatedTestsTabData.applyButton, BorderLayout.SOUTH)
 
-        applyButton.isOpaque = false
-        applyButton.isContentAreaFilled = false
+        generatedTestsTabData.applyButton.isOpaque = false
+        generatedTestsTabData.applyButton.isContentAreaFilled = false
     }
 
     /**

diff --git a/...n/kotlin/org/jetbrains/research/testspark/display/generatedTests/GeneratedTestsTabData.kt b/...n/kotlin/org/jetbrains/research/testspark/display/generatedTests/GeneratedTestsTabData.kt
@@ -4,7 +4,9 @@ import com.intellij.ui.EditorTextField
 import com.intellij.ui.components.JBScrollPane
 import com.intellij.ui.content.Content
 import com.intellij.ui.content.ContentManager
+import org.jetbrains.research.testspark.bundles.plugin.PluginLabelsBundle
 import org.jetbrains.research.testspark.core.data.TestCase
+import javax.swing.JButton
 import javax.swing.JCheckBox
 import javax.swing.JPanel
 
@@ -16,6 +18,7 @@ class GeneratedTestsTabData {
     val unselectedTestCases: HashMap<Int, TestCase> = HashMap()
     val testCasePanelFactories: ArrayList<TestCasePanelBuilder> = arrayListOf()
     var allTestCasePanel: JPanel = JPanel()
+    val applyButton: JButton = JButton(PluginLabelsBundle.get("applyButton"))
     var scrollPane: JBScrollPane = JBScrollPane(
         allTestCasePanel,
         JBScrollPane.VERTICAL_SCROLLBAR_ALWAYS,

diff --git a/...in/kotlin/org/jetbrains/research/testspark/display/generatedTests/TestCasePanelBuilder.kt b/...in/kotlin/org/jetbrains/research/testspark/display/generatedTests/TestCasePanelBuilder.kt
@@ -407,7 +407,8 @@ class TestCasePanelBuilder(
      */
     private fun sendRequest() {
         loadingLabel.isVisible = true
-        enableComponents(false)
+        enableGlobalComponents(false)
+        enableLocalComponents(false)
 
         ProgressManager.getInstance()
             .run(object : Task.Backgroundable(project, PluginMessagesBundle.get("sendingFeedback")) {
@@ -447,13 +448,19 @@ class TestCasePanelBuilder(
             })
     }
 
-    private fun finishProcess() {
+    private fun finishProcess(enableGlobal: Boolean = true) {
         uiContext!!.errorMonitor.clear()
         loadingLabel.isVisible = false
-        enableComponents(true)
+        if (enableGlobal) enableGlobalComponents(true)
+        enableLocalComponents(true)
     }
 
-    private fun enableComponents(isEnabled: Boolean) {
+    private fun enableGlobalComponents(isEnabled: Boolean) {
+        generatedTestsTabData.topButtonsPanelBuilder.getRemoveAllButton().isEnabled = isEnabled
+        generatedTestsTabData.applyButton.isEnabled = isEnabled
+    }
+
+    private fun enableLocalComponents(isEnabled: Boolean) {
         nextButton.isEnabled = isEnabled
         previousButton.isEnabled = isEnabled
         runTestButton.isEnabled = isEnabled
@@ -502,12 +509,13 @@ class TestCasePanelBuilder(
         if (!runTestButton.isEnabled) return
 
         loadingLabel.isVisible = true
-        enableComponents(false)
+        enableGlobalComponents(false)
+        enableLocalComponents(false)
 
         ProgressManager.getInstance()
             .run(object : Task.Backgroundable(project, PluginMessagesBundle.get("sendingFeedback")) {
                 override fun run(indicator: ProgressIndicator) {
-                    runTest(IJProgressIndicator(indicator))
+                    runTest(IJProgressIndicator(indicator), true)
                 }
             })
     }
@@ -517,14 +525,15 @@ class TestCasePanelBuilder(
         if (!runTestButton.isEnabled) return
 
         loadingLabel.isVisible = true
-        enableComponents(false)
+        enableGlobalComponents(false)
+        enableLocalComponents(false)
 
         tasks.add { indicator ->
-            runTest(indicator)
+            runTest(indicator, false)
         }
     }
 
-    private fun runTest(indicator: CustomProgressIndicator) {
+    private fun runTest(indicator: CustomProgressIndicator, enableGlobal: Boolean) {
         indicator.setText("Executing ${testCase.testName}")
 
         val fileName = TestAnalyzerFactory.create(language).getFileNameFromTestCaseCode(testCase.testCode)
@@ -558,7 +567,7 @@ class TestCasePanelBuilder(
             update()
         }
 
-        finishProcess()
+        finishProcess(enableGlobal)
         indicator.stop()
     }
 

diff --git a/.../kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt b/.../kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt
@@ -107,10 +107,14 @@ class TopButtonsPanelBuilder {
             testCasePanelFactory.addTask(tasks)
         }
         // run tasks one after each other
-        executeTasks(project, tasks)
+        executeTasks(project, tasks, generatedTestsTabData)
     }
 
-    private fun executeTasks(project: Project, tasks: Queue<(CustomProgressIndicator) -> Unit>) {
+    private fun executeTasks(
+        project: Project,
+        tasks: Queue<(CustomProgressIndicator) -> Unit>,
+        generatedTestsTabData: GeneratedTestsTabData,
+    ) {
         val nextTask = tasks.poll()
 
         nextTask?.let { task ->
@@ -121,10 +125,14 @@ class TopButtonsPanelBuilder {
 
                 override fun onFinished() {
                     super.onFinished()
-                    executeTasks(project, tasks)
+                    executeTasks(project, tasks, generatedTestsTabData)
                 }
             })
         }
+        if (nextTask == null) {
+            generatedTestsTabData.topButtonsPanelBuilder.getRemoveAllButton().isEnabled = true
+            generatedTestsTabData.applyButton.isEnabled = true
+        }
     }
 
     fun getPanel(project: Project, generatedTestsTabData: GeneratedTestsTabData): JPanel {