diff options
Diffstat (limited to 'test')
3 files changed, 32 insertions, 4 deletions
diff --git a/test/configuration/src/lombok/core/configuration/TestConfiguration.java b/test/configuration/src/lombok/core/configuration/TestConfiguration.java index 504c36b2..ebb556de 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('\\', '/').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(); + String out = new String(rawOut.toByteArray()).replace('\\', '/').replace("\r", "").replaceAll(Pattern.quote(normalizedName) + "|" + Pattern.quote(baseName), "BASE/").trim(); + String err = new String(rawErr.toByteArray()).replace('\\', '/').replace("\r", "").replaceAll(Pattern.quote(normalizedName) + "|" + Pattern.quote(baseName), "BASE/").trim(); checkContent(directory, out, "out"); checkContent(directory, err, "err"); diff --git a/test/core/src/lombok/LombokTestSource.java b/test/core/src/lombok/LombokTestSource.java index e23a0f57..1498e635 100644 --- a/test/core/src/lombok/LombokTestSource.java +++ b/test/core/src/lombok/LombokTestSource.java @@ -65,11 +65,20 @@ public class LombokTestSource { public boolean runOnPlatform(String platform) { if (platforms == null || platforms.isEmpty()) return true; + int inclusiveCount = 0; for (String pl : platforms) { - if (pl.startsWith("!") && pl.regionMatches(true, 1, platform, 0, platform.length())) return false; + if (pl.startsWith("!")) continue; + inclusiveCount++; if (pl.equalsIgnoreCase(platform)) return true; } - return false; + if (inclusiveCount == platforms.size()) { + return false; + } + for (String pl : platforms) { + if (!pl.startsWith("!")) continue; + if (pl.regionMatches(true, 1, platform, 0, platform.length())) return false; + } + return true; } public boolean versionWithinLimit(int version) { diff --git a/test/transform/resource/before/DelegateOnLocalClass.java b/test/transform/resource/before/DelegateOnLocalClass.java new file mode 100644 index 00000000..7376c087 --- /dev/null +++ b/test/transform/resource/before/DelegateOnLocalClass.java @@ -0,0 +1,19 @@ +//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run. +//skip compare content +//ignore: crashed javac with NPE, should be enabled when that bug is fixed +import lombok.experimental.Delegate; +import lombok.Getter; + +interface DelegateOnLocalClass { + void test1() { + class DelegateOnStatic { + @Delegate private final java.lang.Runnable field = null; + } + } + + void test2() { + Runnable r = new Runnable() { + @Delegate private final java.lang.Runnable field = null; + } + } +} |