This is an automated email from the ASF dual-hosted git repository.
dbalek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 25dfbe7 [GR-29499] Fixing bug in updaing the list of discovered
tests. (#2774)
25dfbe7 is described below
commit 25dfbe797c4dae9986cf2769a4f167ca35cd1628
Author: Dusan Balek <[email protected]>
AuthorDate: Mon Feb 22 18:15:38 2021 +0100
[GR-29499] Fixing bug in updaing the list of discovered tests. (#2774)
---
.../modules/java/lsp/server/protocol/ServerTest.java | 14 ++++++++++++--
java/java.lsp.server/vscode/src/testAdapter.ts | 10 +++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git
a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
index 4b3bd3f..ea38440 100644
---
a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
+++
b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
@@ -720,6 +720,7 @@ public class ServerTest extends NbTestCase {
public void testGoToDefinition() throws Exception {
File src = new File(getWorkDir(), "Test.java");
src.getParentFile().mkdirs();
+ try (Writer w = new FileWriter(new File(src.getParentFile(),
".test-project"))) {}
String code = "public class Test {\n" +
" private int field;\n" +
" public void method(int ppp) {\n" +
@@ -739,6 +740,7 @@ public class ServerTest extends NbTestCase {
"}");
}
FileUtil.refreshFor(getWorkDir());
+ CountDownLatch indexingComplete = new CountDownLatch(1);
Launcher<LanguageServer> serverLauncher =
LSPLauncher.createClientLauncher(new LanguageClient() {
@Override
public void telemetryEvent(Object arg0) {
@@ -750,7 +752,12 @@ public class ServerTest extends NbTestCase {
}
@Override
- public void showMessage(MessageParams arg0) {
+ public void showMessage(MessageParams params) {
+ if (Server.INDEXING_COMPLETED.equals(params.getMessage())) {
+ indexingComplete.countDown();
+ } else {
+ throw new UnsupportedOperationException("Unexpected
message.");
+ }
}
@Override
@@ -765,7 +772,10 @@ public class ServerTest extends NbTestCase {
}, client.getInputStream(), client.getOutputStream());
serverLauncher.startListening();
LanguageServer server = serverLauncher.getRemoteProxy();
- InitializeResult result = server.initialize(new
InitializeParams()).get();
+ InitializeParams initParams = new InitializeParams();
+ initParams.setRootUri(getWorkDir().toURI().toString());
+ server.initialize(initParams).get();
+ indexingComplete.await();
server.getTextDocumentService().didOpen(new
DidOpenTextDocumentParams(new TextDocumentItem(toURI(src), "java", 0, code)));
Position pos = new Position(3, 30);
List<? extends Location> definition =
server.getTextDocumentService().definition(new DefinitionParams(new
TextDocumentIdentifier(toURI(src)), pos)).get().getLeft();
diff --git a/java/java.lsp.server/vscode/src/testAdapter.ts
b/java/java.lsp.server/vscode/src/testAdapter.ts
index 6beed2c..ab1b6fb 100644
--- a/java/java.lsp.server/vscode/src/testAdapter.ts
+++ b/java/java.lsp.server/vscode/src/testAdapter.ts
@@ -174,8 +174,8 @@ export class NbTestAdapter implements TestAdapter {
changed = true
}
if (suite.tests) {
+ const children: (TestSuiteInfo | TestInfo)[] = [];
suite.tests.forEach(test => {
- const children: (TestSuiteInfo | TestInfo)[] = [];
let currentTest = (currentSuite as
TestSuiteInfo).children.find(ti => ti.id === test.id);
if (currentTest) {
children.push(currentTest);
@@ -192,11 +192,11 @@ export class NbTestAdapter implements TestAdapter {
children.push({ type: 'test', id: test.id, label:
test.shortName, tooltip: test.fullName, file: test.file ?
Uri.parse(test.file)?.path : undefined, line: test.line });
changed = true;
}
- if ((currentSuite as TestSuiteInfo).children.length !==
children.length) {
- changed = true;
- }
- (currentSuite as TestSuiteInfo).children = children;
});
+ if ((currentSuite as TestSuiteInfo).children.length !==
children.length) {
+ changed = true;
+ }
+ (currentSuite as TestSuiteInfo).children = children;
}
} else {
const children: TestInfo[] = suite.tests ? suite.tests.map(test =>
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
