Fix tests regarding os specific line endings (#399)

On Windows two tests fail because additional \r chars are being used for new lines. To fix this issue those chars are being removed from exception texts. Signed-off-by: Michael Schäfer <[email protected]>
eclipse-lsp4j · Jan 24, 2020 · 5ad981b · 5ad981b
1 parent 4e476ba
commit 5ad981b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...clipse.lsp4j.jsonrpc/src/test/java/org/eclipse/lsp4j/jsonrpc/test/RemoteEndpointTest.java b/...clipse.lsp4j.jsonrpc/src/test/java/org/eclipse/lsp4j/jsonrpc/test/RemoteEndpointTest.java
@@ -213,7 +213,7 @@ public CompletableFuture<Object> request(String method, Object parameter) {
 			assertEquals(ResponseErrorCode.InternalError.getValue(), response.getError().getCode());
 			String exception = (String) response.getError().getData();
 			String expected = "java.lang.RuntimeException: BAAZ\n\tat org.eclipse.lsp4j.jsonrpc.test.RemoteEndpointTest";
-			assertEquals(expected, exception.substring(0, expected.length()));
+			assertEquals(expected, exception.replaceAll("\\r", "").substring(0, expected.length()));
 		} finally {
 			logMessages.unregister();
 		}

diff --git a/org.eclipse.lsp4j/src/test/java/org/eclipse/lsp4j/test/LSPEndpointTest.xtend b/org.eclipse.lsp4j/src/test/java/org/eclipse/lsp4j/test/LSPEndpointTest.xtend
@@ -72,7 +72,7 @@ class LSPEndpointTest {
 			assertEquals('''
 				Lists must not contain null references. Path: $.result.contents[0]
 				Lists must not contain null references. Path: $.result.contents[1]
-			'''.toString.trim, exception.cause.message)
+			'''.toString.replaceAll("\\r", "").trim, exception.cause.message)
 			assertFalse(future.isDone)
 		} finally {
 			in.close()