From 61488a241df00c64523359d3fc94953fe52d913f Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 6 Apr 2025 18:57:01 +0000 Subject: [PATCH 1/6] Update AST CLI Java Wrapper to version 2.4.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c7cb131d..2bb31d31 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation 'com.miglayout:miglayout-swing:11.3' if (javaWrapperVersion == "" || javaWrapperVersion == null) { - implementation('com.checkmarx.ast:ast-cli-java-wrapper:2.2.1'){ + implementation('com.checkmarx.ast:ast-cli-java-wrapper:2.4.3'){ exclude group: 'junit', module: 'junit' } } else { From 3fdfe9383f1d2c026ef9671fe40104066a254016 Mon Sep 17 00:00:00 2001 From: AlvoBen <144705560+AlvoBen@users.noreply.github.com> Date: Tue, 8 Apr 2025 14:03:42 +0300 Subject: [PATCH 2/6] Update build.gradle --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2bb31d31..ff6bf03e 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,6 @@ dependencies { } implementation(platform("com.fasterxml.jackson:jackson-bom:2.16.1")) // Temporary workaround https://github.com/FasterXML/jackson-databind/issues/3428 - testImplementation 'org.mockito:mockito-core:5.0.0' testImplementation 'org.mockito:mockito-junit-jupiter:5.0.0' // maybe remove } From 93e5658b785aa4c864795a195a9cd8870573e1f5 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Tue, 8 Apr 2025 15:05:34 +0300 Subject: [PATCH 3/6] Increase uiWaitDuration to 800 for improved test stability --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ff6bf03e..aa1e374b 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ downloadRobotServerPlugin { test { useJUnitPlatform() - systemProperty 'uiWaitDuration', project.findProperty('uiWaitDuration') ?: 300 + systemProperty 'uiWaitDuration', project.findProperty('uiWaitDuration') ?: 800 testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" showExceptions true From d634ec37ea6c2c61f31a9ed0c930dbd205d07cb5 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Wed, 9 Apr 2025 11:44:54 +0300 Subject: [PATCH 4/6] Add clearSelection call before triggering scan in testTriggerScanAndLoadResults --- src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java b/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java index bf625d47..3387d456 100644 --- a/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java +++ b/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java @@ -84,7 +84,7 @@ public void testTriggerScanProjectWithDifferentOrganizationsDontMatch() { @Video public void testTriggerScanAndLoadResults() { if (triggerScanNotAllowed()) return; - + clearSelection(); waitForScanIdSelection(); findRunScanButtonAndClick(); JTreeFixture treeBeforeScan = find(JTreeFixture.class, TREE); From d54a736d06b1f4907504a884c5727d0afb5800bb Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Wed, 9 Apr 2025 12:03:25 +0300 Subject: [PATCH 5/6] Refactor testTriggerScanAndLoadResults to include selection actions for Project, Branch, and Scan --- src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java b/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java index 3387d456..6ef0d975 100644 --- a/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java +++ b/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java @@ -84,7 +84,9 @@ public void testTriggerScanProjectWithDifferentOrganizationsDontMatch() { @Video public void testTriggerScanAndLoadResults() { if (triggerScanNotAllowed()) return; - clearSelection(); + testSelectionAction(findSelection("Project"), "Project", "DiffOrg/WebGoat"); + testSelectionAction(findSelection("Branch"), "Branch", Environment.BRANCH_NAME); + testSelectionAction(findSelection("Scan"), "Scan", Environment.SCAN_ID_NOT_MATCH_PROJECT); waitForScanIdSelection(); findRunScanButtonAndClick(); JTreeFixture treeBeforeScan = find(JTreeFixture.class, TREE); From 88e248172fdf2050112ea379985f008a78e52f83 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Wed, 9 Apr 2025 16:08:10 +0300 Subject: [PATCH 6/6] Enhance testTriggerScanAndLoadResults with additional selection actions for Project, Branch, and Scan --- src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java b/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java index 6ef0d975..ce7d3939 100644 --- a/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java +++ b/src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java @@ -87,6 +87,9 @@ public void testTriggerScanAndLoadResults() { testSelectionAction(findSelection("Project"), "Project", "DiffOrg/WebGoat"); testSelectionAction(findSelection("Branch"), "Branch", Environment.BRANCH_NAME); testSelectionAction(findSelection("Scan"), "Scan", Environment.SCAN_ID_NOT_MATCH_PROJECT); + testSelectionAction(findSelection("Project"), "Project", Environment.PROJECT_NAME); + testSelectionAction(findSelection("Branch"), "Branch", Environment.BRANCH_NAME); + testSelectionAction(findSelection("Scan"), "Scan", Environment.SCAN_ID); waitForScanIdSelection(); findRunScanButtonAndClick(); JTreeFixture treeBeforeScan = find(JTreeFixture.class, TREE);