Skip to content

Commit

Permalink
Update to JUnit 5.9.1
Browse files Browse the repository at this point in the history 
BeforeAll can't be private is detected now so fixed.
Also changed edited files to no longer have all tests public as it's not
required.
  • Loading branch information
@akurtakov @mickaelistria
akurtakov authored and mickaelistria committed Oct 6, 2022
1 parent d24a9d9 commit 14449bf
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
2 changes: 1 addition & 1 deletion lemminx-maven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<lemminx.maven.indexDirectory>${project.build.directory}/test-index</lemminx.maven.indexDirectory>
<maven.repo.local>${settings.localRepository}</maven.repo.local>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<junit-jupiter.version>5.9.1</junit-jupiter.version>
<lemminx.version>0.21.0</lemminx.version>
<maven.version>3.8.5</maven.version>
</properties>
Expand Down
16 changes: 8 additions & 8 deletions ...rc/test/java/org/eclipse/lemminx/extensions/maven/participants/RemoteCentralRepoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

public class RemoteCentralRepoTest {
class RemoteCentralRepoTest {
private static RemoteCentralRepositorySearcher repoSearcher = new RemoteCentralRepositorySearcher(null);

@BeforeAll
private static void setup() {
static void setup() {
RemoteCentralRepositorySearcher.disableCentralSearch = false;
}

@Test
public void testGetArtifacts() {
void testGetArtifacts() {
String G = null;
String A = null;
String V = null;
Expand Down Expand Up @@ -66,7 +66,7 @@ public void testGetArtifacts() {
}

@Test
public void testGetArtifactVersionss() {
void testGetArtifactVersionss() {

String G = "org.fujion.webjars";
String A = "webjar-angular";
Expand All @@ -87,7 +87,7 @@ public void testGetArtifactVersionss() {
}

@Test
public void testGetGroupIdss() {
void testGetGroupIdss() {

String G = "org.fujion";

Expand Down Expand Up @@ -115,7 +115,7 @@ public void testGetGroupIdss() {
}

@Test
public void testGetPlugiArtifacts() {
void testGetPlugiArtifacts() {

String G = null;
String A = null;
Expand Down Expand Up @@ -151,7 +151,7 @@ public void testGetPlugiArtifacts() {
}

@Test
public void testGetPluginArtifactVersionss() {
void testGetPluginArtifactVersionss() {

String G = "com.github.gianttreelp.proguardservicesmapper";
String A = "proguard-services-mapper-maven";
Expand All @@ -172,7 +172,7 @@ public void testGetPluginArtifactVersionss() {
}

@Test
public void testGetPluginGroupIdss() {
void testGetPluginGroupIdss() {

String G = "com.github.gianttreelp.proguardservicesmapper";

Expand Down
18 changes: 8 additions & 10 deletions ...pse/lemminx/extensions/maven/participants/completion/RemoteCentralRepoAssistanceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,19 @@
import org.eclipse.lemminx.services.XMLLanguageService;
import org.eclipse.lemminx.settings.SharedSettings;
import org.eclipse.lsp4j.CompletionItem;
import org.eclipse.lsp4j.Hover;
import org.eclipse.lsp4j.MarkupContent;
import org.eclipse.lsp4j.Position;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;

public class RemoteCentralRepoAssistanceTest {
class RemoteCentralRepoAssistanceTest {

private XMLLanguageService languageService;

@BeforeAll
private static void setup() {
static void setup() {
RemoteCentralRepositorySearcher.disableCentralSearch = false;
}

Expand Down Expand Up @@ -77,7 +75,7 @@ private void loopUntilCompletionItemFound(DOMDocument document, Position positio

@Test
@Timeout(value = 15000, unit = TimeUnit.MILLISECONDS)
public void testRemoteCentralGroupIdCompletion()
void testRemoteCentralGroupIdCompletion()
throws IOException, InterruptedException, ExecutionException, URISyntaxException {
loopUntilCompletionItemFound(createDOMDocument("/pom-remote-central-groupId-complete.xml"), //
new Position(11, 33), "org.fujion.webjars");
Expand All @@ -86,7 +84,7 @@ public void testRemoteCentralGroupIdCompletion()

@Test
@Timeout(value = 15000, unit = TimeUnit.MILLISECONDS)
public void testRemoteCentralArtifactIdCompletion()
void testRemoteCentralArtifactIdCompletion()
throws IOException, InterruptedException, ExecutionException, URISyntaxException {
loopUntilCompletionItemFound(createDOMDocument("/pom-remote-central-artifactId-complete.xml"), //
new Position(12, 24), "webjar-angular - org.fujion.webjars:webjar-angular:");
Expand All @@ -95,7 +93,7 @@ public void testRemoteCentralArtifactIdCompletion()

@Test
@Timeout(value = 15000, unit = TimeUnit.MILLISECONDS)
public void testRemoteCentralVersionCompletion()
void testRemoteCentralVersionCompletion()
throws IOException, InterruptedException, ExecutionException, URISyntaxException {
loopUntilCompletionItemFound(createDOMDocument("/pom-remote-central-version-complete.xml"), //
new Position(13, 21), "13.1.1-1");
Expand All @@ -104,7 +102,7 @@ public void testRemoteCentralVersionCompletion()

@Test
@Timeout(value = 15000, unit = TimeUnit.MILLISECONDS)
public void testRemoteCentralPluginGroupIdCompletion()
void testRemoteCentralPluginGroupIdCompletion()
throws IOException, InterruptedException, ExecutionException, URISyntaxException {
loopUntilCompletionItemFound(createDOMDocument("/pom-remote-central-plugin-groupId-complete.xml"), //
new Position(12, 45), "com.github.gianttreelp.proguardservicesmapper");
Expand All @@ -113,7 +111,7 @@ public void testRemoteCentralPluginGroupIdCompletion()

@Test
@Timeout(value = 15000, unit = TimeUnit.MILLISECONDS)
public void testRemoteCentralPluginArtifactIdCompletion()
void testRemoteCentralPluginArtifactIdCompletion()
throws IOException, InterruptedException, ExecutionException, URISyntaxException {
loopUntilCompletionItemFound(createDOMDocument("/pom-remote-central-plugin-artifactId-complete.xml"), //
new Position(13, 24), "proguard-services-mapper-maven - com.github.gianttreelp.proguardservicesmapper:proguard-services-mapper-maven:");
Expand All @@ -122,7 +120,7 @@ public void testRemoteCentralPluginArtifactIdCompletion()

@Test
@Timeout(value = 15000, unit = TimeUnit.MILLISECONDS)
public void testRemoteCentralPluginVersionCompletion()
void testRemoteCentralPluginVersionCompletion()
throws IOException, InterruptedException, ExecutionException, URISyntaxException {
loopUntilCompletionItemFound(createDOMDocument("/pom-remote-central-plugin-version-complete.xml"), //
new Position(14, 21), "1.0");
Expand Down

0 comments on commit 14449bf

Please sign in to comment.