diff options
| author | Rawi01 <Rawi01@users.noreply.github.com> | 2020-08-31 09:38:14 +0200 |
|---|---|---|
| committer | Rawi01 <Rawi01@users.noreply.github.com> | 2020-08-31 09:38:14 +0200 |
| commit | 23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4 (patch) | |
| tree | 5e159ce51df5436a7ab5aeb18c0edb0605a1c2f1 /test/configuration | |
| parent | 2b4b5c983540af4a4c08cfb7a3d4057df0b84c39 (diff) | |
| parent | 9148294f78a8e646ee131ca182a9b692bc028fdb (diff) | |
| download | lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.tar.gz lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.tar.bz2 lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.zip | |
Merge branch 'master' into eclipse-javadoc
Conflicts:
src/core/lombok/javac/handlers/JavacHandlerUtil.java
test/core/src/lombok/RunTestsViaEcj.java
Diffstat (limited to 'test/configuration')
| -rw-r--r-- | test/configuration/src/lombok/core/configuration/TestConfiguration.java | 4 |
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"); |