2222package com .github ._1c_syntax .bsl .languageserver ;
2323
2424import com .github ._1c_syntax .bsl .languageserver .context .ServerContext ;
25- import com .github ._1c_syntax .bsl .languageserver .events .LanguageServerInitializeRequestReceivedEvent ;
2625import com .github ._1c_syntax .bsl .languageserver .jsonrpc .DiagnosticParams ;
2726import com .github ._1c_syntax .bsl .languageserver .providers .DiagnosticProvider ;
2827import com .github ._1c_syntax .bsl .languageserver .util .CleanupContextBeforeClassAndAfterClass ;
3736import org .eclipse .lsp4j .DidSaveTextDocumentParams ;
3837import org .eclipse .lsp4j .DocumentDiagnosticParams ;
3938import org .eclipse .lsp4j .ImplementationParams ;
40- import org .eclipse .lsp4j .InitializeParams ;
4139import org .eclipse .lsp4j .Position ;
4240import org .eclipse .lsp4j .PrepareRenameParams ;
4341import org .eclipse .lsp4j .RenameParams ;
4644import org .eclipse .lsp4j .TextDocumentIdentifier ;
4745import org .eclipse .lsp4j .TextDocumentItem ;
4846import org .eclipse .lsp4j .VersionedTextDocumentIdentifier ;
49- import org .eclipse .lsp4j .services .LanguageServer ;
5047import org .junit .jupiter .api .Test ;
5148import org .springframework .beans .factory .annotation .Autowired ;
5249import org .springframework .boot .test .context .SpringBootTest ;
53- import org .springframework .context .ApplicationEventPublisher ;
5450import org .springframework .test .context .bean .override .mockito .MockitoSpyBean ;
5551
5652import java .io .File ;
5955import java .nio .charset .StandardCharsets ;
6056import java .util .ArrayList ;
6157import java .util .List ;
58+ import java .util .Optional ;
6259import java .util .concurrent .ExecutionException ;
6360
6461import static org .assertj .core .api .Assertions .assertThat ;
6562import static org .awaitility .Awaitility .await ;
6663import static org .mockito .ArgumentMatchers .any ;
6764import static org .mockito .Mockito .clearInvocations ;
68- import static org .mockito .Mockito .mock ;
6965import static org .mockito .Mockito .never ;
7066import static org .mockito .Mockito .verify ;
67+ import static org .mockito .Mockito .when ;
7168
7269@ SpringBootTest
7370@ CleanupContextBeforeClassAndAfterClass
@@ -79,9 +76,7 @@ class BSLTextDocumentServiceTest {
7976 private ServerContext serverContext ;
8077 @ MockitoSpyBean
8178 private DiagnosticProvider diagnosticProvider ;
82- @ Autowired
83- private ApplicationEventPublisher eventPublisher ;
84- @ Autowired
79+ @ MockitoSpyBean
8580 private ClientCapabilitiesHolder clientCapabilitiesHolder ;
8681
8782
@@ -216,13 +211,8 @@ void didClosePublishesEmptyDiagnosticsWhenClientDoesNotSupportPullDiagnostics()
216211 // Simulate client without pull diagnostics support
217212 var capabilities = new ClientCapabilities ();
218213 // No TextDocumentClientCapabilities.diagnostic set
219- clientCapabilitiesHolder .setCapabilities (capabilities );
220-
221- var languageServer = mock (LanguageServer .class );
222- var params = new InitializeParams ();
223- params .setCapabilities (capabilities );
224- var event = new LanguageServerInitializeRequestReceivedEvent (languageServer , params );
225- eventPublisher .publishEvent (event );
214+ when (clientCapabilitiesHolder .getCapabilities ()).thenReturn (Optional .of (capabilities ));
215+ textDocumentService .handleInitializeEvent (null );
226216
227217 // Clear any invocations from didOpen
228218 clearInvocations (diagnosticProvider );
@@ -248,13 +238,8 @@ void didCloseDoesNotPublishEmptyDiagnosticsWhenClientSupportsPullDiagnostics() t
248238 var textDocumentCapabilities = new TextDocumentClientCapabilities ();
249239 textDocumentCapabilities .setDiagnostic (new DiagnosticCapabilities ());
250240 capabilities .setTextDocument (textDocumentCapabilities );
251- clientCapabilitiesHolder .setCapabilities (capabilities );
252-
253- var languageServer = mock (LanguageServer .class );
254- var params = new InitializeParams ();
255- params .setCapabilities (capabilities );
256- var event = new LanguageServerInitializeRequestReceivedEvent (languageServer , params );
257- eventPublisher .publishEvent (event );
241+ when (clientCapabilitiesHolder .getCapabilities ()).thenReturn (Optional .of (capabilities ));
242+ textDocumentService .handleInitializeEvent (null );
258243
259244 // Clear any invocations from didOpen
260245 clearInvocations (diagnosticProvider );
0 commit comments