Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
Expand All @@ -80,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
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/com/checkmarx/intellij/ui/TestTriggerScan.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@ public void testTriggerScanProjectWithDifferentOrganizationsDontMatch() {
@Video
public void testTriggerScanAndLoadResults() {
if (triggerScanNotAllowed()) return;

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);
Expand Down
Loading