Trying to stabilize tests.

Author: lahodaj

java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java

@@ -358,8 +358,17 @@ void cancelDiagnostics(AtomicBoolean cancel) {
     }
 
     class LspClient implements LanguageClient {
+        private final String uri2CatchDiags;
         List<MessageParams> loggedMessages = new ArrayList<>();
 
+        public LspClient() {
+            this(null);
+        }
+
+        public LspClient(String uri2CatchDiags) {
+            this.uri2CatchDiags = uri2CatchDiags;
+        }
+
         @Override
         public CompletableFuture<Void> createProgress(WorkDoneProgressCreateParams params) {
             return CompletableFuture.completedFuture(null);
@@ -378,8 +387,11 @@ public void telemetryEvent(Object arg0) {
         public void publishDiagnostics(PublishDiagnosticsParams params) {
             synchronized (diags) {
                 diagnosticURIs.add(params.getUri());
-                diags.add(params.getDiagnostics());
-                diags.notifyAll();
+
+                if (uri2CatchDiags == null || uri2CatchDiags.equals(params.getUri())) {
+                    diags.add(params.getDiagnostics());
+                    diags.notifyAll();
+                }
             }
         }
 
@@ -490,7 +502,7 @@ public void testDiagnosticsRemovedForDeletedFile() throws Exception {
         try (Writer w = new FileWriter(src)) {
             w.write(code);
         }
-        Launcher<LanguageServer> serverLauncher = createClientLauncherWithLogging(new LspClient(), client.getInputStream(), client.getOutputStream());
+        Launcher<LanguageServer> serverLauncher = createClientLauncherWithLogging(new LspClient(src.toURI().toString()), client.getInputStream(), client.getOutputStream());
         serverLauncher.startListening();
         LanguageServer server = serverLauncher.getRemoteProxy();
         InitializeResult result = server.initialize(new InitializeParams()).get();