Skip to content

Commit 6cd44e2

Browse files
fbriconfbricon
committed
debt: migrate tests to JUnit 5
Signed-off-by: Fred Bricon <fbricon@gmail.com>
1 parent 82bdb0d commit 6cd44e2

209 files changed

Lines changed: 16144 additions & 16078 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target‎

Lines changed: 99 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,105 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
33
<target includeMode="feature" name="Java Language Server Target Definition" sequenceNumber="113">
4-
<locations>
5-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<unit id="org.eclipse.buildship.feature.group" version="0.0.0"/>
7-
<repository location="https://download.eclipse.org/buildship/updates/latest-snapshot/"/>
8-
</location>
9-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
10-
<unit id="org.eclipse.m2e.jdt" version="0.0.0"/>
11-
<unit id="org.eclipse.m2e.apt.core" version="0.0.0"/>
12-
<unit id="org.eclipse.m2e.core" version="0.0.0"/>
13-
<unit id="org.eclipse.m2e.maven.runtime" version="0.0.0"/>
14-
<unit id="org.eclipse.m2e.workspace.cli" version="0.0.0"/>
15-
<repository location="https://download.eclipse.org/technology/m2e/releases/2.10.0"/>
16-
</location>
17-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
18-
<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
19-
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="0.0.0"/>
20-
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
21-
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
22-
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
23-
<unit id="org.mockito.mockito-core" version="0.0.0"/>
24-
<unit id="org.apache.commons.commons-io" version="0.0.0"/>
25-
<unit id="org.eclipse.jdt.apt.pluggable.core" version="0.0.0"/>
4+
<locations>
5+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
6+
<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
7+
<repository location="https://download.eclipse.org/buildship/updates/latest-snapshot/" />
8+
</location>
9+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
10+
<unit id="org.eclipse.m2e.jdt" version="0.0.0" />
11+
<unit id="org.eclipse.m2e.apt.core" version="0.0.0" />
12+
<unit id="org.eclipse.m2e.core" version="0.0.0" />
13+
<unit id="org.eclipse.m2e.maven.runtime" version="0.0.0" />
14+
<unit id="org.eclipse.m2e.workspace.cli" version="0.0.0" />
15+
<repository location="https://download.eclipse.org/technology/m2e/releases/2.10.0" />
16+
</location>
17+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
18+
<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0" />
19+
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="0.0.0" />
20+
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
21+
<unit id="org.eclipse.platform.feature.group" version="0.0.0" />
22+
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0" />
23+
<unit id="org.mockito.mockito-core" version="0.0.0" />
24+
<unit id="org.apache.commons.commons-io" version="0.0.0" />
25+
<unit id="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" />
2626
<unit id="org.eclipse.pde.junit.runtime" version="0.0.0" />
2727
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0" />
28+
<unit id="junit-jupiter-api" version="5.14.1" />
29+
<unit id="junit-jupiter-params" version="5.14.1" />
30+
<unit id="junit-vintage-engine" version="5.14.1" />
31+
<unit id="junit-platform-suite-engine" version="1.14.1" />
2832
<unit id="org.eclipse.jdt.core.manipulation" version="0.0.0" />
29-
<unit id="org.eclipse.jdt.core.compiler.batch" version="0.0.0"/>
30-
<unit id="org.eclipse.jdt.core" version="0.0.0"/>
31-
<unit id="org.eclipse.jdt.apt.core" version="0.0.0"/>
32-
<repository location="https://download.eclipse.org/eclipse/updates/4.38/R-4.38-202512010920/"/>
33-
</location>
34-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
35-
<unit id="org.eclipse.jdt.core.javac" version="0.0.0"/>
36-
<repository location="https://ci.eclipse.org/ls/job/eclipse.jdt.javac/job/main/lastSuccessfulBuild/artifact/repository/target/repository/"/>
37-
</location>
38-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
39-
<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
40-
<unit id="ch.qos.logback.classic" version="0.0.0"/>
41-
<unit id="ch.qos.logback.core" version="0.0.0"/>
42-
<repository location="https://download.eclipse.org/releases/2025-12/"/>
43-
</location>
44-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
45-
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0/"/>
46-
<unit id="org.eclipse.lsp4j" version="0.0.0"/>
47-
</location>
48-
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
49-
<dependencies>
50-
<dependency>
51-
<groupId>commons-codec</groupId>
52-
<artifactId>commons-codec</artifactId>
53-
<version>1.20.0</version>
54-
<type>jar</type>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.apache.commons</groupId>
58-
<artifactId>commons-lang3</artifactId>
59-
<version>3.20.0</version>
60-
<type>jar</type>
61-
</dependency>
62-
</dependencies>
63-
</location>
64-
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="3rd party" missingManifest="generate" type="Maven">
65-
<dependencies>
66-
<dependency>
67-
<groupId>com.vladsch.flexmark</groupId>
68-
<artifactId>flexmark-html2md-converter</artifactId>
69-
<version>0.64.8</version>
70-
<type>jar</type>
71-
</dependency>
72-
<dependency>
73-
<groupId>jakarta.servlet</groupId>
74-
<artifactId>jakarta.servlet-api</artifactId>
75-
<version>6.2.0-M1</version>
76-
<type>jar</type>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.apache.commons</groupId>
80-
<artifactId>commons-text</artifactId>
81-
<version>1.15.0</version>
82-
<type>jar</type>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.jsoup</groupId>
86-
<artifactId>jsoup</artifactId>
87-
<version>1.19.1</version>
88-
<type>jar</type>
89-
</dependency>
90-
</dependencies>
91-
<exclude>org.jsoup:jsoup:1.15.4</exclude>
92-
</location>
93-
</locations>
94-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25"/>
95-
</target>
33+
<unit id="org.eclipse.jdt.core.compiler.batch" version="0.0.0" />
34+
<unit id="org.eclipse.jdt.core" version="0.0.0" />
35+
<unit id="org.eclipse.jdt.apt.core" version="0.0.0" />
36+
<repository location="https://download.eclipse.org/eclipse/updates/4.38/R-4.38-202512010920/" />
37+
</location>
38+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
39+
<unit id="org.eclipse.jdt.core.javac" version="0.0.0" />
40+
<repository location="https://ci.eclipse.org/ls/job/eclipse.jdt.javac/job/main/lastSuccessfulBuild/artifact/repository/target/repository/" />
41+
</location>
42+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
43+
<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0" />
44+
<unit id="ch.qos.logback.classic" version="0.0.0" />
45+
<unit id="ch.qos.logback.core" version="0.0.0" />
46+
<repository location="https://download.eclipse.org/releases/2025-12/" />
47+
</location>
48+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
49+
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0/" />
50+
<unit id="org.eclipse.lsp4j" version="0.0.0" />
51+
</location>
52+
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
53+
<dependencies>
54+
<dependency>
55+
<groupId>commons-codec</groupId>
56+
<artifactId>commons-codec</artifactId>
57+
<version>1.20.0</version>
58+
<type>jar</type>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.apache.commons</groupId>
62+
<artifactId>commons-lang3</artifactId>
63+
<version>3.20.0</version>
64+
<type>jar</type>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.mockito</groupId>
68+
<artifactId>mockito-junit-jupiter</artifactId>
69+
<version>5.20.0</version>
70+
<type>jar</type>
71+
</dependency>
72+
</dependencies>
73+
</location>
74+
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="3rd party" missingManifest="generate" type="Maven">
75+
<dependencies>
76+
<dependency>
77+
<groupId>com.vladsch.flexmark</groupId>
78+
<artifactId>flexmark-html2md-converter</artifactId>
79+
<version>0.64.8</version>
80+
<type>jar</type>
81+
</dependency>
82+
<dependency>
83+
<groupId>jakarta.servlet</groupId>
84+
<artifactId>jakarta.servlet-api</artifactId>
85+
<version>6.2.0-M1</version>
86+
<type>jar</type>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.commons</groupId>
90+
<artifactId>commons-text</artifactId>
91+
<version>1.15.0</version>
92+
<type>jar</type>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.jsoup</groupId>
96+
<artifactId>jsoup</artifactId>
97+
<version>1.19.1</version>
98+
<type>jar</type>
99+
</dependency>
100+
</dependencies>
101+
<exclude>org.jsoup:jsoup:1.15.4</exclude>
102+
</location>
103+
</locations>
104+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25" />
105+
</target>

‎org.eclipse.jdt.ls.tests.syntaxserver/META-INF/MANIFEST.MF‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.jdt.ls.tests.syntaxserver;singleton:=true
55
Bundle-Version: 1.55.0.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-21
7-
Import-Package: org.osgi.framework;version="1.3.0"
7+
Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)",
8+
org.junit.jupiter.api.extension;version="[5.14.0,6.0.0)",
9+
org.mockito;version="[5.20.0,6.0.0)",
10+
org.mockito.junit.jupiter;version="[5.20.0,6.0.0)",
11+
org.mockito.quality;version="[5.20.0,6.0.0)",
12+
org.mockito.stubbing;version="[5.20.0,6.0.0)",
13+
org.osgi.framework;version="1.3.0"
814
Bundle-Localization: plugin
915
Bundle-ActivationPolicy: lazy
1016
Require-Bundle: org.eclipse.jdt.ls.core,
@@ -14,7 +20,6 @@ Require-Bundle: org.eclipse.jdt.ls.core,
1420
org.eclipse.jdt.core.manipulation,
1521
org.eclipse.text;bundle-version="3.6.0",
1622
org.eclipse.core.filebuffers;bundle-version="3.6.0",
17-
org.junit;bundle-version="4.12.0",
1823
org.apache.commons.commons-io;bundle-version="2.2.0",
1924
org.apache.commons.lang3;bundle-version="3.1.0",
2025
com.google.gson;bundle-version="2.7.0",
@@ -23,7 +28,6 @@ Require-Bundle: org.eclipse.jdt.ls.core,
2328
org.eclipse.xtext.xbase.lib,
2429
org.eclipse.jdt.launching,
2530
org.eclipse.ltk.core.refactoring,
26-
org.mockito.mockito-core;bundle-version="4.3.1",
2731
org.eclipse.jdt.ls.tests
2832
Bundle-Vendor: %Bundle-Vendor
2933
Bundle-Activator: org.eclipse.jdt.ls.core.internal.JavaSyntaxServerTestPlugin

‎org.eclipse.jdt.ls.tests.syntaxserver/src/org/eclipse/jdt/ls/core/internal/syntaxserver/AbstractSyntaxProjectsManagerBasedTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
import org.eclipse.jdt.ls.core.internal.preferences.ClientPreferences;
5555
import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
5656
import org.eclipse.jdt.ls.core.internal.preferences.Preferences;
57-
import org.junit.After;
58-
import org.junit.Before;
57+
import org.junit.jupiter.api.AfterEach;
58+
import org.junit.jupiter.api.BeforeEach;
5959
import org.mockito.Mock;
6060
import org.mockito.Mockito;
6161

@@ -90,7 +90,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
9090
}
9191
});
9292

93-
@Before
93+
@BeforeEach
9494
public void initProjectManager() throws Exception {
9595
clientRequests.clear();
9696

@@ -169,7 +169,7 @@ protected File getWorkingProjectDirectory() throws IOException {
169169
return dir;
170170
}
171171

172-
@After
172+
@AfterEach
173173
public void cleanUp() throws Exception {
174174
JavaLanguageServerPlugin.setPreferencesManager(oldPreferenceManager);
175175
projectsManager = null;

‎org.eclipse.jdt.ls.tests.syntaxserver/src/org/eclipse/jdt/ls/core/internal/syntaxserver/SyntaxServerTest.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
package org.eclipse.jdt.ls.core.internal.syntaxserver;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertFalse;
18-
import static org.junit.Assert.assertNotNull;
19-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertFalse;
18+
import static org.junit.jupiter.api.Assertions.assertNotNull;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
2020
import static org.mockito.Mockito.when;
2121

2222
import java.io.IOException;
@@ -69,22 +69,25 @@
6969
import org.eclipse.lsp4j.TextEdit;
7070
import org.eclipse.lsp4j.TypeDefinitionParams;
7171
import org.eclipse.lsp4j.jsonrpc.messages.Either;
72-
import org.junit.After;
73-
import org.junit.Before;
74-
import org.junit.Test;
75-
import org.junit.runner.RunWith;
72+
import org.junit.jupiter.api.AfterEach;
73+
import org.junit.jupiter.api.BeforeEach;
74+
import org.junit.jupiter.api.Test;
75+
import org.junit.jupiter.api.extension.ExtendWith;
7676
import org.mockito.Mockito;
77-
import org.mockito.junit.MockitoJUnitRunner;
77+
import org.mockito.junit.jupiter.MockitoExtension;
78+
import org.mockito.junit.jupiter.MockitoSettings;
79+
import org.mockito.quality.Strictness;
7880

79-
@RunWith(MockitoJUnitRunner.class)
81+
@ExtendWith(MockitoExtension.class)
82+
@MockitoSettings(strictness = Strictness.LENIENT)
8083
public class SyntaxServerTest extends AbstractSyntaxProjectsManagerBasedTest {
8184
private SyntaxLanguageServer server;
8285
private CoreASTProvider sharedASTProvider;
8386

8487
private String oldServerMode = "";
8588
private boolean oldBuildStatus = false;
8689

87-
@Before
90+
@BeforeEach
8891
public void setup() throws Exception {
8992
oldServerMode = System.getProperty(JDTEnvironmentUtils.SYNTAX_SERVER_ID);
9093
System.setProperty(JDTEnvironmentUtils.SYNTAX_SERVER_ID, "true");
@@ -98,7 +101,7 @@ public void setup() throws Exception {
98101
importProjects("maven/salut4");
99102
}
100103

101-
@After
104+
@AfterEach
102105
public void tearDown() throws Exception {
103106
if (oldServerMode == null) {
104107
System.clearProperty(JDTEnvironmentUtils.SYNTAX_SERVER_ID);
@@ -297,7 +300,7 @@ public void testCompletionOnSingleName() throws Exception{
297300
CompletionParams params = new CompletionParams(identifier, new Position(loc[0], loc[1]));
298301
CompletionList list = server.completion(params).join().getRight();
299302
assertNotNull(list);
300-
assertFalse("No proposals were found", list.getItems().isEmpty());
303+
assertFalse(list.getItems().isEmpty(),"No proposals were found");
301304

302305
List<CompletionItem> items = list.getItems();
303306
for (CompletionItem item : items) {
@@ -340,7 +343,7 @@ public void testCompletionOnQualifiedName() throws Exception{
340343
CompletionParams params = new CompletionParams(identifier, new Position(loc[0], loc[1]));
341344
CompletionList list = server.completion(params).join().getRight();
342345
assertNotNull(list);
343-
assertFalse("No proposals were found", list.getItems().isEmpty());
346+
assertFalse(list.getItems().isEmpty(),"No proposals were found");
344347

345348
List<CompletionItem> items = list.getItems();
346349
for (CompletionItem item : items) {

‎org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@ Bundle-SymbolicName: org.eclipse.jdt.ls.tests;singleton:=true
66
Bundle-Version: 1.55.0.qualifier
77
Export-Package: org.eclipse.jdt.ls.core.internal;x-friends:="org.eclipse.jdt.ls.tests.syntaxserver"
88
Bundle-RequiredExecutionEnvironment: JavaSE-21
9-
Import-Package: org.osgi.framework;version="1.3.0"
9+
Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)",
10+
org.junit.jupiter.api.extension;version="[5.14.0,6.0.0)",
11+
org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
12+
org.junit.jupiter.params;version="[5.14.0,6.0.0)",
13+
org.junit.jupiter.params.provider;version="[5.14.0,6.0.0)",
14+
org.mockito;version="[5.20.0,6.0.0)",
15+
org.mockito.invocation;version="[5.20.0,6.0.0)",
16+
org.mockito.junit.jupiter;version="[5.20.0,6.0.0)",
17+
org.mockito.quality;version="[5.20.0,6.0.0)",
18+
org.mockito.stubbing;version="[5.20.0,6.0.0)",
19+
org.mockito.verification;version="[5.20.0,6.0.0)",
20+
org.opentest4j;version="[1.3.0,2.0.0)",
21+
org.osgi.framework;version="1.3.0"
1022
Bundle-Localization: plugin
1123
Bundle-ActivationPolicy: lazy
1224
Require-Bundle: org.eclipse.jdt.ls.core,
@@ -21,7 +33,6 @@ Require-Bundle: org.eclipse.jdt.ls.core,
2133
org.eclipse.m2e.core,
2234
org.eclipse.m2e.maven.runtime,
2335
org.eclipse.m2e.jdt,
24-
org.junit;bundle-version="4.12.0",
2536
org.apache.commons.commons-io;bundle-version="2.2.0",
2637
org.eclipse.buildship.core;bundle-version="1.0.18",
2738
org.apache.commons.lang3;bundle-version="3.1.0",
@@ -34,7 +45,6 @@ Require-Bundle: org.eclipse.jdt.ls.core,
3445
org.eclipse.jdt.apt.pluggable.core,
3546
org.eclipse.m2e.apt.core,
3647
org.eclipse.buildship.core,
37-
org.mockito.mockito-core;bundle-version="4.3.1",
3848
org.eclipse.jdt.ls.filesystem;bundle-version="1.0.0"
3949
Bundle-Vendor: %Bundle-Vendor
4050
Bundle-Activator: org.eclipse.jdt.ls.core.internal.JavaLanguageServerTestPlugin

‎org.eclipse.jdt.ls.tests/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@
5050
<configuration>
5151
<argLine>${tycho.testArgLine} ${os.testArgs} "${lombokArgs}"</argLine>
5252
<runOrder>random</runOrder>
53-
<providerProperties>
54-
<excludegroups>org.eclipse.jdt.ls.tests.Unstable</excludegroups>
55-
</providerProperties>
5653
</configuration>
5754

5855
</plugin>

0 commit comments

Comments
 (0)