Skip to content

Commit ac97a8e

Browse files
SLLS-447 use dedicated config scope for analyzeVCSChangedFiles test
1 parent 5515246 commit ac97a8e

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,25 +1117,23 @@ void analyseOpenFileIgnoringExcludes() {
11171117
}
11181118

11191119
@Test
1120-
@Disabled
11211120
void analyzeVCSChangedFiles() throws Exception {
1121+
var folder = makeStaticTempDir();
11221122
var vcsChangedAnalysisFileName = "analyzeVCSChangedFiles.py";
1123-
var vcsChangedFile = new SonarLintExtendedLanguageClient.FoundFileDto(vcsChangedAnalysisFileName, analysisDir.resolve(vcsChangedAnalysisFileName).toFile().getAbsolutePath(),
1123+
var vcsChangedFile = new SonarLintExtendedLanguageClient.FoundFileDto(vcsChangedAnalysisFileName, folder.resolve(vcsChangedAnalysisFileName).toFile().getAbsolutePath(),
11241124
"def foo():\n toto = 0\n");
11251125

1126-
setUpFindFilesInFolderResponse(analysisDir.toUri().toString(), List.of(vcsChangedFile));
1126+
setUpFindFilesInFolderResponse(folder.toUri().toString(), List.of(vcsChangedFile));
1127+
addFolder(folder.toUri().toString(), "VCS Folder");
11271128

11281129
// Initialize git repository
1129-
try (var gitRepo = Git.init().setDirectory(analysisDir.toFile()).call()) {
1130+
try (var gitRepo = Git.init().setDirectory(folder.toFile()).call()) {
11301131
var fileName = "analyzeVCSChangedFiles.py";
1131-
var fileUri = analysisDir.resolve(fileName);
1132+
var fileUri = folder.resolve(fileName);
11321133
Files.createFile(fileUri);
11331134
Files.writeString(fileUri, "def foo():\n toto = 0\n");
11341135

1135-
// Ensure file is created before calling lsProxy
1136-
await().atMost(5, SECONDS).until(() -> Files.exists(fileUri));
1137-
1138-
lsProxy.analyzeVCSChangedFiles(new SonarLintExtendedLanguageServer.AnalyzeVCSChangedFilesParams(List.of(analysisDir.toUri().toString())));
1136+
lsProxy.analyzeVCSChangedFiles(new SonarLintExtendedLanguageServer.AnalyzeVCSChangedFilesParams(List.of(folder.toUri().toString())));
11391137

11401138
awaitUntilAsserted(() -> assertThat(client.getDiagnostics(fileUri.toUri().toString()))
11411139
.extracting(startLine(), startCharacter(), endLine(), endCharacter(), code(), Diagnostic::getSource, Diagnostic::getMessage,

0 commit comments

Comments
 (0)