Skip to content

Commit 791623c

Browse files
Remove assertions on logs
1 parent 7e1c2b4 commit 791623c

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

src/test/java/org/sonarsource/sonarlint/ls/mediumtests/AbstractLanguageServerMediumTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ public CompletableFuture<List<Object>> configuration(ConfigurationParams configu
517517
} else if (item.getScopeUri() != null && !item.getSection().equals(SONARLINT_CONFIGURATION_NAMESPACE)) {
518518
result
519519
.add(Optional.ofNullable(folderSettings.get(item.getScopeUri()))
520-
.orElse(new HashMap<>()));
520+
.orElseThrow(() -> new IllegalStateException("No settings mocked for workspaceFolderPath " + item.getScopeUri())));
521521
// we don't want to repeat the same setting for one folder 5 times :)
522522
break;
523523
}

src/test/java/org/sonarsource/sonarlint/ls/mediumtests/ConnectedModeMediumTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ void analysisConnected_find_tracked_hotspot_after_sq_10_1() {
495495

496496
var uriInFolder = folder1BaseDir.resolve("hotspot.py").toUri().toString();
497497
addConfigScope(folder1BaseDir.toUri().toString());
498-
awaitUntilAsserted(() -> assertThat(client.logs).anyMatch(messageParams -> messageParams.getMessage().contains("Merged 1 hotspots in store. Closed 0.")));
499498
lsProxy.didLocalBranchNameChange(new SonarLintExtendedLanguageServer.DidLocalBranchNameChangeParams(folder1BaseDir.toUri().toString(), "master"));
500499

501500
didOpen(uriInFolder, "python", "IP_ADDRESS = '12.34.56.78'\n");
@@ -1010,7 +1009,6 @@ void change_hotspot_status_to_resolved() {
10101009

10111010
var uriInFolder = folder1BaseDir.resolve(analyzedFileName).toUri().toString();
10121011
addConfigScope(folder1BaseDir.toUri().toString());
1013-
awaitUntilAsserted(() -> assertThat(client.logs).anyMatch(messageParams -> messageParams.getMessage().contains("Merged 1 hotspots in store. Closed 0.")));
10141012
lsProxy.didLocalBranchNameChange(new SonarLintExtendedLanguageServer.DidLocalBranchNameChangeParams(folder1BaseDir.toUri().toString(), "master"));
10151013

10161014
didOpen(uriInFolder, "python", "IP_ADDRESS = '12.34.56.78'\n");
@@ -1087,7 +1085,6 @@ void should_not_change_hotspot_status_to_resolved() {
10871085

10881086
var uriInFolder = folder1BaseDir.resolve(analyzedFileName).toUri().toString();
10891087
addConfigScope(folder1BaseDir.toUri().toString());
1090-
awaitUntilAsserted(() -> assertThat(client.logs).anyMatch(messageParams -> messageParams.getMessage().contains("Merged 1 hotspots in store. Closed 0.")));
10911088
lsProxy.didLocalBranchNameChange(new SonarLintExtendedLanguageServer.DidLocalBranchNameChangeParams(folder1BaseDir.toUri().toString(), "master"));
10921089

10931090
didOpen(uriInFolder, "python", "IP_ADDRESS = '12.34.56.78'\n");
@@ -1177,7 +1174,6 @@ void change_hotspot_status_permission_check() throws ExecutionException, Interru
11771174

11781175
var uriInFolder = folder1BaseDir.resolve(analyzedFileName).toUri().toString();
11791176
addConfigScope(folder1BaseDir.toUri().toString());
1180-
awaitUntilAsserted(() -> assertThat(client.logs).anyMatch(messageParams -> messageParams.getMessage().contains("Merged 1 hotspots in store. Closed 0.")));
11811177

11821178
didOpen(uriInFolder, "python", "IP_ADDRESS = '12.34.56.78'\n");
11831179

src/test/java/org/sonarsource/sonarlint/ls/mediumtests/LanguageServerMediumTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,6 @@ void testListAllRules() {
745745
}
746746

747747
@Test
748-
@Disabled
749748
void logErrorWhenClientFailedToReturnConfiguration(@TempDir Path tempDir) {
750749
// No workspaceFolderPath settings registered in the client mock, so it should fail when server will request workspaceFolderPath
751750
// configuration
@@ -1179,6 +1178,7 @@ void accepted_binding_suggestion() {
11791178
@Override
11801179
protected void setUpFolderSettings(Map<String, Map<String, Object>> folderSettings) {
11811180
addSonarQubeConnection(client.globalSettings, CONNECTION_ID, mockWebServerExtension.url("/"), TOKEN);
1181+
folderSettings.put(analysisDir.toUri().toString(), new HashMap<>());
11821182
}
11831183

11841184
private Predicate<? super MessageParams> notFromContextualTSserver() {

0 commit comments

Comments
 (0)