Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Eclipse pipeline tests and upgrade java wrapper to version 2.0.9 (AST-38217) #145

Merged
merged 7 commits into from
May 15, 2024
Merged

Fix Eclipse pipeline tests and upgrade java wrapper to version 2.0.9 (AST-38217) #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7edea7b
fix attempt
checkmarx-kobi-hagmi May 12, 2024
02bed35
Updated timeout
checkmarx-kobi-hagmi May 12, 2024
4f1c4a2
Updated java wrapper to 2.0.9
checkmarx-kobi-hagmi May 13, 2024
e59de9c
Revert "Updated java wrapper to 2.0.9"
checkmarx-kobi-hagmi May 13, 2024
608dc17
upgrade java wrapper attempt #2
checkmarx-kobi-hagmi May 13, 2024
9ea1573
updated gitignore to exclude IDE generated files
checkmarx-kobi-hagmi May 15, 2024
1e02513
removed idea files
checkmarx-kobi-hagmi May 15, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
/bin/
.DS_Store
/.metadata/
.idea/
.vs/
.vscode/
4 changes: 2 additions & 2 deletions ...-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/ui/BaseUITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static void beforeClass() throws Exception {
// Used to decrease tests velocity
SWTBotPreferences.PLAYBACK_DELAY = 100;

SWTBotPreferences.TIMEOUT = 5000;
SWTBotPreferences.TIMEOUT = 8000;

_bot = new SWTWorkbenchBot();

Expand Down Expand Up @@ -242,7 +242,7 @@ protected static void waitUntilBranchComboIsEnabled() throws TimeoutException {
break;
}

_bot.sleep(5000);
_bot.sleep(8000);

retryIdx++;
}
Expand Down
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.12.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.12.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.12.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ast-cli-java-wrapper-1.0.64.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ast-cli-java-wrapper-2.0.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.13.4.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.lang_2.6.0.v20220406-2305.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Bundle-ClassPath: lib/slf4j-simple-1.7.5.jar,
lib/jackson-annotations-2.12.4.jar,
lib/jackson-core-2.12.4.jar,
lib/commons-lang3-3.12.0.jar,
lib/ast-cli-java-wrapper-1.0.64.jar,
lib/ast-cli-java-wrapper-2.0.9.jar,
lib/jackson-databind-2.13.4.2.jar,
lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar,
lib/org.apache.commons.lang_2.6.0.v20220406-2305.jar,
Expand Down
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ bin.includes = plugin.xml,\
lib/jackson-annotations-2.12.4.jar,\
lib/jackson-core-2.12.4.jar,\
lib/commons-lang3-3.12.0.jar,\
lib/ast-cli-java-wrapper-1.0.64.jar,\
lib/ast-cli-java-wrapper-2.0.9.jar,\
lib/jackson-databind-2.13.4.2.jar,\
lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar,\
.,\
Expand Down
Binary file renamed ...lugin/lib/ast-cli-java-wrapper-1.0.64.jar → ...plugin/lib/ast-cli-java-wrapper-2.0.9.jar
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,13 +566,15 @@ private void createResultViewPanel(Composite resultsComposite) {

triageSeverityComboViewew = new ComboViewer(triageView, SWT.READ_ONLY);
Combo combo_1 = triageSeverityComboViewew.getCombo();
combo_1.setEnabled(true);
combo_1.setData(PluginConstants.DATA_ID_KEY, PluginConstants.TRIAGE_SEVERITY_COMBO_ID);
GridData gd_combo_1 = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
gd_combo_1.widthHint = SWT.DEFAULT;
combo_1.setLayoutData(gd_combo_1);

triageStateComboViewer = new ComboViewer(triageView, SWT.READ_ONLY);
Combo combo_2 = triageStateComboViewer.getCombo();
combo_2.setEnabled(true);
combo_2.setData(PluginConstants.DATA_ID_KEY, PluginConstants.TRIAGE_STATE_COMBO_ID);
GridData gd_combo_2 = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
// gd_combo_2.widthHint = 180;
Expand Down
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/actions/ActionStartScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ protected IStatus run(IProgressMonitor arg0) {
@Override
public void run() {
AbstractNotificationPopup notification = new NotificationPopUpUI(Display.getCurrent(), PluginConstants.CX_SCAN_CANCELED_TITLE, PluginConstants.CX_SCAN_CANCELED_DESCRIPTION, null, null, null);
notification.setDelayClose(5000);
notification.setDelayClose(8000);
notification.open();
}
});
Expand Down
Loading