aboutsummaryrefslogtreecommitdiff
path: root/test/configuration/src
diff options
context:
space:
mode:
authorRostislav Krasny <45571812+rosti-il@users.noreply.github.com>2020-08-18 04:03:23 +0300
committerRostislav Krasny <45571812+rosti-il@users.noreply.github.com>2020-08-18 04:09:25 +0300
commit79c3d383fd7d46ec1c6c5cf83d8b05f2238529a2 (patch)
tree83dec678a33158c003dc53b2a2643156b1a70de3 /test/configuration/src
parent7dfbe4323c15cbd88983380b27a250d2a381d148 (diff)
downloadlombok-79c3d383fd7d46ec1c6c5cf83d8b05f2238529a2.tar.gz
lombok-79c3d383fd7d46ec1c6c5cf83d8b05f2238529a2.tar.bz2
lombok-79c3d383fd7d46ec1c6c5cf83d8b05f2238529a2.zip
Fix tests under Windows, fix test.javac11 and test.javac14, fix issue #1745
The change of the TestConfiguration.java is based on the fact that Git for Windows is configured with 'core.autocrlf=true' by default.
Diffstat (limited to 'test/configuration/src')
-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");