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 9a045e3a6b Expand unrolled spock tests. (#3945)
9a045e3a6b is described below
commit 9a045e3a6be39ed99f5eb1545246bf8f92482d25
Author: Dusan Balek <[email protected]>
AuthorDate: Mon Apr 11 07:42:02 2022 +0200
Expand unrolled spock tests. (#3945)
---
.../modules/java/lsp/server/progress/TestProgressHandler.java | 4 ----
java/java.lsp.server/vscode/src/testAdapter.ts | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/TestProgressHandler.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/TestProgressHandler.java
index 470293d5b6..84009e5d46 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/TestProgressHandler.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/TestProgressHandler.java
@@ -86,10 +86,6 @@ public final class TestProgressHandler implements
TestResultDisplayHandler.Spi<T
String className = report.getSuiteClassName();
for (Testcase test : report.getTests()) {
String name = test.getDisplayName();
- int idx = name.indexOf('(');
- if (idx > 0) {
- name = name.substring(0, idx);
- }
String id = className + ':' + name;
String state = statusToState(test.getStatus());
List<String> stackTrace = test.getTrouble() != null ?
Arrays.asList(test.getTrouble().getStackTrace()) : null;
diff --git a/java/java.lsp.server/vscode/src/testAdapter.ts
b/java/java.lsp.server/vscode/src/testAdapter.ts
index ce18374bb8..2b8c90f635 100644
--- a/java/java.lsp.server/vscode/src/testAdapter.ts
+++ b/java/java.lsp.server/vscode/src/testAdapter.ts
@@ -158,7 +158,7 @@ export class NbTestAdapter {
if (!currentTest) {
const subName =
this.subTestName(item, test);
if (subName) {
- currentTest =
item.children.get(test.id);
+ currentTest = subName === '()'
? item : item.children.get(test.id);
}
}
});
@@ -236,7 +236,7 @@ export class NbTestAdapter {
const parents: Map<TestItem, string> = new Map();
currentSuite?.children.forEach(item => {
const subName = this.subTestName(item, test);
- if (subName) {
+ if (subName && '()' !== subName) {
parents.set(item, subName);
}
});
@@ -278,7 +278,7 @@ export class NbTestAdapter {
}
return label;
} else {
- const regexp = new RegExp(item.id.replace(/#\S*/g, '\\S*'));
+ const regexp = new
RegExp(item.id.replace(/[-[\]{}()*+?.,\\^$|\s]/g, '\\$&').replace(/#\w*/g,
'\\S*'));
if (regexp.test(test.id)) {
let idx = test.id.indexOf(':');
return idx < 0 ? test.id : test.id.slice(idx + 1);
---------------------------------------------------------------------
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
