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

SLE-986: Update SLCORE #783

Merged
merged 3 commits into from
Dec 9, 2024
Merged

SLE-986: Update SLCORE #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31add19
SLE-986: Update SLCORE
thahnen Dec 9, 2024
6d51b01
NO-JIRA: Make RulesConfigurationTest less error prone
thahnen Dec 9, 2024
69b9b7e
NO-JIRA: Check for file not found was moved to SLCORE
thahnen Dec 9, 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
8 changes: 4 additions & 4 deletions ....connected.sc/src/org/sonarlint/eclipse/its/connected/sc/SonarCloudConnectedModeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,11 @@
import org.sonarlint.eclipse.its.shared.reddeer.conditions.CFamilyLoaded;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.ConfirmConnectionCreationDialogOpened;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.DialogMessageIsExpected;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.FileNotFoundDialogOpened;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.FixSuggestionAvailableDialogOpened;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.FixSuggestionUnavailableDialogOpened;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.ProjectBindingWizardIsOpened;
import org.sonarlint.eclipse.its.shared.reddeer.conditions.ProjectSelectionDialogOpened;
import org.sonarlint.eclipse.its.shared.reddeer.dialogs.ConfirmConnectionCreationDialog;
import org.sonarlint.eclipse.its.shared.reddeer.dialogs.FileNotFoundDialog;
import org.sonarlint.eclipse.its.shared.reddeer.dialogs.FixSuggestionAvailableDialog;
import org.sonarlint.eclipse.its.shared.reddeer.dialogs.FixSuggestionUnavailableDialog;
import org.sonarlint.eclipse.its.shared.reddeer.dialogs.ProjectSelectionDialog;
Expand Down Expand Up @@ -262,8 +260,10 @@ public void fixSuggestion_with_ConnectionSetup_fileNotFound() throws Interrupted
new WaitUntil(new ProjectSelectionDialogOpened());
new ProjectSelectionDialog().ok();

new WaitUntil(new FileNotFoundDialogOpened());
new FileNotFoundDialog().ok();
// The error message from SLCORE is not denoted by a specific title.
var shellOpt = shellByName("SonarQube");
assertThat(shellOpt).isNotEmpty();
shellOpt.get().close();
}

@Test
Expand Down
28 changes: 0 additions & 28 deletions ...red/src/org/sonarlint/eclipse/its/shared/reddeer/conditions/FileNotFoundDialogOpened.java
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...e.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FileNotFoundDialog.java
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions ...lipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/RulesConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,13 @@ public void ruleParametersGlobalDefaults() {
public void ruleParametersActivationRoundTrip() {
var ruleConfigurationPreferences = RuleConfigurationPreferences.open();
var cognitiveComplexityRuleItem = ruleConfigurationPreferences.selectRule("java:S3776", "Java", "Cognitive Complexity of methods should not be too high");

assertThat(ruleConfigurationPreferences.getRuleParamSpinner().isEnabled()).isTrue();
await().untilAsserted(() -> assertThat(ruleConfigurationPreferences.getRuleParamSpinner().isEnabled()).isTrue());

new ContextMenu(cognitiveComplexityRuleItem).getItem("Deactivate").select();
assertThat(ruleConfigurationPreferences.getRuleParamSpinner().isEnabled()).isFalse();
await().untilAsserted(() -> assertThat(ruleConfigurationPreferences.getRuleParamSpinner().isEnabled()).isFalse());

new ContextMenu(cognitiveComplexityRuleItem).getItem("Activate").select();
assertThat(ruleConfigurationPreferences.getRuleParamSpinner().isEnabled()).isTrue();
await().untilAsserted(() -> assertThat(ruleConfigurationPreferences.getRuleParamSpinner().isEnabled()).isTrue());

ruleConfigurationPreferences.cancel();
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<tycho.version>4.0.8</tycho.version>

<!-- Sloop embedded CLI version for fragment projects -->
<sloop.version>10.11.0.79687</sloop.version>
<sloop.version>10.11.2.79730</sloop.version>

<!-- SonarQube analysis -->
<sonar.java.source>11</sonar.java.source>
Expand Down
2 changes: 1 addition & 1 deletion target-platforms/commons-build.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.sonarsource.sonarlint.core</groupId>
<artifactId>sonarlint-java-client-osgi</artifactId>
<version>10.11.0.79687</version>
<version>10.11.2.79730</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
Loading