From c78ce4433993b0bc662ebf078932c19c39e6c6fb Mon Sep 17 00:00:00 2001 From: Arkadii Sapozhnikov Date: Fri, 30 Aug 2024 17:44:42 +0200 Subject: [PATCH 1/2] check generatedTestsTabData.testCasePanelFactories.size --- .../display/generatedTests/TopButtonsPanelBuilder.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt b/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt index c51ec0ebb..8e8b47b61 100644 --- a/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt +++ b/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt @@ -41,13 +41,21 @@ class TopButtonsPanelBuilder { */ fun update(generatedTestsTabData: GeneratedTestsTabData) { var numberOfPassedTests = 0 + var numberOfRemovedTests = 0 for (testCasePanelFactory in generatedTestsTabData.testCasePanelFactories) { - if (testCasePanelFactory.isRemoved()) continue + if (testCasePanelFactory.isRemoved()) { + numberOfRemovedTests++ + continue + } val error = testCasePanelFactory.getError() if ((error is String) && error.isEmpty()) { numberOfPassedTests++ } } + if (generatedTestsTabData.testCasePanelFactories.size == numberOfRemovedTests) { + removeAllButton.doClick() + return + } testsSelectedLabel.text = String.format( testsSelectedText, generatedTestsTabData.testsSelected, From 72715e531b452bc8eeb6b1063300b60b5d4c62c4 Mon Sep 17 00:00:00 2001 From: Arkadii Sapozhnikov Date: Mon, 30 Sep 2024 16:14:51 +0200 Subject: [PATCH 2/2] fix TopButtonsPanelBuilder.update --- .../generatedTests/TopButtonsPanelBuilder.kt | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt b/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt index 8e8b47b61..844a3f83f 100644 --- a/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt +++ b/src/main/kotlin/org/jetbrains/research/testspark/display/generatedTests/TopButtonsPanelBuilder.kt @@ -40,19 +40,13 @@ class TopButtonsPanelBuilder { * Updates the labels. */ fun update(generatedTestsTabData: GeneratedTestsTabData) { - var numberOfPassedTests = 0 - var numberOfRemovedTests = 0 - for (testCasePanelFactory in generatedTestsTabData.testCasePanelFactories) { - if (testCasePanelFactory.isRemoved()) { - numberOfRemovedTests++ - continue - } - val error = testCasePanelFactory.getError() - if ((error is String) && error.isEmpty()) { - numberOfPassedTests++ - } - } - if (generatedTestsTabData.testCasePanelFactories.size == numberOfRemovedTests) { + val passedTestsCount = generatedTestsTabData.testCasePanelFactories + .filter { !it.isRemoved() } + .count { it.getError()?.isEmpty() == true } + + val removedTestsCount = generatedTestsTabData.testCasePanelFactories.count { it.isRemoved() } + + if (generatedTestsTabData.testCasePanelFactories.size == removedTestsCount) { removeAllButton.doClick() return } @@ -64,7 +58,7 @@ class TopButtonsPanelBuilder { testsPassedLabel.text = String.format( testsPassedText, - numberOfPassedTests, + passedTestsCount, generatedTestsTabData.testCaseNameToPanel.size, ) runAllButton.isEnabled = false