aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2020-08-28 00:27:33 +0200
committerGitHub <noreply@github.com>2020-08-28 00:27:33 +0200
commit409f0428c712207a920acd3ca7c429d97f2d13a1 (patch)
tree9f55f565aaaf162b45d79b63a2a5276766753559 /test
parent7f8e15762d4f3428d38579f702e65a4a302b1dac (diff)
parent79c3d383fd7d46ec1c6c5cf83d8b05f2238529a2 (diff)
downloadlombok-409f0428c712207a920acd3ca7c429d97f2d13a1.tar.gz
lombok-409f0428c712207a920acd3ca7c429d97f2d13a1.tar.bz2
lombok-409f0428c712207a920acd3ca7c429d97f2d13a1.zip
Merge pull request #2548 from rosti-il/master
Fix tests under Windows, fix test.javac11 and test.javac14, fix issue #1745
Diffstat (limited to 'test')
-rw-r--r--test/configuration/src/lombok/core/configuration/TestConfiguration.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/configuration/src/lombok/core/configuration/TestConfiguration.java b/test/configuration/src/lombok/core/configuration/TestConfiguration.java
index 3032daf3..504c36b2 100644
--- a/test/configuration/src/lombok/core/configuration/TestConfiguration.java
+++ b/test/configuration/src/lombok/core/configuration/TestConfiguration.java
@@ -65,8 +65,8 @@ public class TestConfiguration {
outStream.flush();
errStream.flush();
- String out = new String(rawOut.toByteArray()).replace("\r\n", "\n").replace('\\', '/').replaceAll(Pattern.quote(normalizedName) + "|" + Pattern.quote(baseName), "BASE/").trim();
- String err = new String(rawErr.toByteArray()).replace("\r\n", "\n").replace('\\', '/').replaceAll(Pattern.quote(normalizedName) + "|" + Pattern.quote(baseName), "BASE/").trim();
+ String out = new String(rawOut.toByteArray()).replace('\\', '/').replaceAll(Pattern.quote(normalizedName) + "|" + Pattern.quote(baseName), "BASE/").trim();
+ String err = new String(rawErr.toByteArray()).replace('\\', '/').replaceAll(Pattern.quote(normalizedName) + "|" + Pattern.quote(baseName), "BASE/").trim();
checkContent(directory, out, "out");
checkContent(directory, err, "err");