Skip to content

Commit 74396fe

Browse files
jonahgrahamjonahgraham
committed
Remove some of the use of xtend in the tests
For some of the trivial use cases of xtend change them to pure Java. This allows more of the tests to build and run with Java 11 as xtend now requires Java 17.
1 parent 0856603 commit 74396fe

File tree

6 files changed

+103
-103
lines changed

6 files changed

+103
-103
lines changed

‎org.eclipse.lsp4j.debug/src/test/java/org/eclipse/lsp4j/debug/test/DSPLauncherTest.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
import java.io.IOException;
1515
import java.io.PipedInputStream;
1616
import java.io.PipedOutputStream;
17+
import java.util.Arrays;
1718
import java.util.LinkedHashMap;
19+
import java.util.List;
1820
import java.util.Map;
21+
import java.util.Objects;
1922
import java.util.concurrent.CompletableFuture;
2023
import java.util.concurrent.ExecutionException;
2124
import java.util.concurrent.Future;
@@ -33,8 +36,6 @@
3336
import org.eclipse.lsp4j.jsonrpc.Launcher;
3437
import org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer;
3538
import org.eclipse.lsp4j.jsonrpc.services.ServiceEndpoints;
36-
import org.eclipse.xtext.xbase.lib.Pair;
37-
import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
3839
import org.junit.After;
3940
import org.junit.Assert;
4041
import org.junit.Before;
@@ -63,21 +64,22 @@ public void testRequest() throws Exception {
6364
result.setSupportTerminateDebuggee(true);
6465
result.setSupportsCompletionsRequest(false);
6566

66-
server.expectedRequests.put("initialize", new Pair<>(p, result));
67+
server.expectedRequests.put("initialize", List.of(p, result));
6768
CompletableFuture<Capabilities> future = clientLauncher.getRemoteProxy().initialize(p);
6869
Assert.assertEquals(result.toString(), future.get(TIMEOUT, TimeUnit.MILLISECONDS).toString());
6970
client.joinOnEmpty();
7071
}
7172

7273
static class AssertingEndpoint implements Endpoint {
73-
public Map<String, Pair<Object, Object>> expectedRequests = new LinkedHashMap<>();
74+
public Map<String, List<Object>> expectedRequests = new LinkedHashMap<>();
7475

7576
@Override
7677
public CompletableFuture<?> request(String method, Object parameter) {
7778
Assert.assertTrue(expectedRequests.containsKey(method));
78-
Pair<Object, Object> result = expectedRequests.remove(method);
79-
Assert.assertEquals(result.getKey().toString(), parameter.toString());
80-
return CompletableFuture.completedFuture(result.getValue());
79+
List<Object> result = expectedRequests.remove(method);
80+
Assert.assertEquals(2, result.size());
81+
Assert.assertEquals(result.get(0).toString(), parameter.toString());
82+
return CompletableFuture.completedFuture(result.get(1));
8183
}
8284

8385
public Map<String, Object> expectedNotifications = new LinkedHashMap<>();
@@ -110,7 +112,7 @@ public void joinOnEmpty() {
110112

111113
@Override
112114
public String toString() {
113-
return new ToStringBuilder(this).addAllFields().toString();
115+
return Arrays.toString(new Object[] {expectedRequests, expectedNotifications});
114116
}
115117

116118
}

‎org.eclipse.lsp4j/src/test/java/org/eclipse/lsp4j/test/launch/LauncherTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.io.PipedInputStream;
1616
import java.io.PipedOutputStream;
1717
import java.util.ArrayList;
18+
import java.util.Arrays;
1819
import java.util.LinkedHashMap;
1920
import java.util.List;
2021
import java.util.Map;
@@ -41,15 +42,13 @@
4142
import org.eclipse.lsp4j.launch.LSPLauncher;
4243
import org.eclipse.lsp4j.services.LanguageClient;
4344
import org.eclipse.lsp4j.services.LanguageServer;
44-
import org.eclipse.xtext.xbase.lib.Pair;
45-
import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
4645
import org.junit.After;
4746
import org.junit.Assert;
4847
import org.junit.Before;
4948
import org.junit.Test;
5049

5150
public class LauncherTest {
52-
51+
5352
private static final long TIMEOUT = 2000;
5453

5554
@Test public void testNotification() throws IOException {
@@ -79,22 +78,23 @@ public class LauncherTest {
7978
item.setKind(CompletionItemKind.Field);
8079
result.getItems().add(item);
8180

82-
server.expectedRequests.put("textDocument/completion", new Pair<>(p, result));
81+
server.expectedRequests.put("textDocument/completion", List.of(p, result));
8382
CompletableFuture<Either<List<CompletionItem>, CompletionList>> future = clientLauncher.getRemoteProxy().getTextDocumentService().completion(p);
8483
Assert.assertEquals(Either.forRight(result).toString(), future.get(TIMEOUT, TimeUnit.MILLISECONDS).toString());
8584
client.joinOnEmpty();
8685
}
8786

8887

8988
static class AssertingEndpoint implements Endpoint {
90-
public Map<String, Pair<Object, Object>> expectedRequests = new LinkedHashMap<>();
89+
public Map<String, List<Object>> expectedRequests = new LinkedHashMap<>();
9190

9291
@Override
9392
public CompletableFuture<?> request(String method, Object parameter) {
9493
Assert.assertTrue(expectedRequests.containsKey(method));
95-
Pair<Object, Object> result = expectedRequests.remove(method);
96-
Assert.assertEquals(result.getKey().toString(), parameter.toString());
97-
return CompletableFuture.completedFuture(result.getValue());
94+
List<Object> result = expectedRequests.remove(method);
95+
Assert.assertEquals(2, result.size());
96+
Assert.assertEquals(result.get(0).toString(), parameter.toString());
97+
return CompletableFuture.completedFuture(result.get(1));
9898
}
9999

100100
public Map<String, Object> expectedNotifications = new LinkedHashMap<>();
@@ -127,7 +127,7 @@ public void joinOnEmpty() {
127127

128128
@Override
129129
public String toString() {
130-
return new ToStringBuilder(this).addAllFields().toString();
130+
return Arrays.toString(new Object[] {expectedRequests, expectedNotifications});
131131
}
132132

133133
}

‎org.eclipse.lsp4j/src/test/java/org/eclipse/lsp4j/test/services/LineEndings.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* Copyright (c) 2016 TypeFox and others.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
8+
* http://www.eclipse.org/org/documents/edl-v10.php.
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
package org.eclipse.lsp4j.test.services;
13+
14+
import java.util.regex.Pattern;
15+
import org.eclipse.xtend2.lib.StringConcatenation;
16+
17+
@SuppressWarnings("all")
18+
public final class LineEndings {
19+
private static final Pattern LINE_ENDING_PAT = Pattern.compile("\\r?\\n");
20+
21+
private LineEndings() {
22+
}
23+
24+
public static String toSystemLineEndings(final CharSequence s) {
25+
return LineEndings.LINE_ENDING_PAT.matcher(s).replaceAll(System.getProperty("line.separator"));
26+
}
27+
}

‎org.eclipse.lsp4j/src/test/java/org/eclipse/lsp4j/test/services/LineEndings.xtend‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎org.eclipse.lsp4j/src/test/java/org/eclipse/lsp4j/test/services/MessageMethods.java‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/**
2+
* Copyright (c) 2016-2019 TypeFox and others.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
8+
* http://www.eclipse.org/org/documents/edl-v10.php.
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
13+
package org.eclipse.lsp4j.test.services;
14+
15+
public interface MessageMethods {
16+
static final String INITIALIZE = "initialize";
17+
static final String SHUTDOWN = "shutdown";
18+
static final String EXIT = "exit";
19+
static final String DOC_COMPLETION = "textDocument/completion";
20+
static final String RESOLVE_COMPLETION = "completionItem/resolve";
21+
static final String DOC_HOVER = "textDocument/hover";
22+
static final String DOC_SIGNATURE_HELP = "textDocument/signatureHelp";
23+
static final String DOC_DECLARATION = "textDocument/declaration";
24+
static final String DOC_DEFINITION = "textDocument/definition";
25+
static final String DOC_TYPE_DEFINITION = "textDocument/typeDefinition";
26+
static final String DOC_IMPLEMENTATION = "textDocument/implementation";
27+
static final String DOC_HIGHLIGHT = "textDocument/documentHighlight";
28+
static final String DOC_REFERENCES = "textDocument/references";
29+
static final String DOC_SYMBOL = "textDocument/documentSymbol";
30+
static final String DOC_CODE_ACTION = "textDocument/codeAction";
31+
static final String DOC_CODE_LENS = "textDocument/codeLens";
32+
static final String RESOLVE_CODE_LENS = "codeLens/resolve";
33+
static final String DOC_FOLDING_RANGE = "textDocument/foldingRange";
34+
static final String DOC_FORMATTING = "textDocument/formatting";
35+
static final String DOC_RANGE_FORMATTING = "textDocument/rangeFormatting";
36+
static final String DOC_TYPE_FORMATTING = "textDocument/onTypeFormatting";
37+
static final String DOC_PREPARE_RENAME = "textDocument/prepareRename";
38+
static final String DOC_RENAME = "textDocument/rename";
39+
static final String DOC_DIAGNOSTIC = "textDocument/diagnostic";
40+
static final String DOC_INLINE_VALUE = "textDocument/inlineValue";
41+
static final String WORKSPACE_SYMBOL = "workspace/symbol";
42+
static final String WORKSPACE_DIAGNOSTIC = "workspace/diagnostic";
43+
static final String DID_OPEN_DOC = "textDocument/didOpen";
44+
static final String DID_CLOSE_DOC = "textDocument/didClose";
45+
static final String DID_CHANGE_DOC = "textDocument/didChange";
46+
static final String DID_SAVE_DOC = "textDocument/didSave";
47+
static final String DID_CHANGE_CONF = "workspace/didChangeConfiguration";
48+
static final String DID_CHANGE_FILES = "workspace/didChangeWatchedFiles";
49+
static final String SHOW_DIAGNOSTICS = "textDocument/publishDiagnostics";
50+
static final String SHOW_MESSAGE = "window/showMessage";
51+
static final String SHOW_MESSAGE_REQUEST = "window/showMessageRequest";
52+
static final String LOG_MESSAGE = "window/logMessage";
53+
static final String PROGRESS_NOTIFY = "$/progress";
54+
static final String PROGRESS_CREATE = "window/workDoneProgress/create";
55+
static final String PROGRESS_CANCEL = "window/workDoneProgress/cancel";
56+
static final String TELEMETRY_EVENT = "telemetry/event";
57+
}

‎org.eclipse.lsp4j/src/test/java/org/eclipse/lsp4j/test/services/MessageMethods.xtend‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)