aboutsummaryrefslogtreecommitdiff
path: root/test/core/src
diff options
context:
space:
mode:
authorReinier Zwitserloot <r.zwitserloot@projectlombok.org>2021-03-14 03:48:05 +0100
committerReinier Zwitserloot <r.zwitserloot@projectlombok.org>2021-03-14 03:48:05 +0100
commita49aec582b129687cee7d2c87b586a20bceb0c43 (patch)
tree73b128a77d8f7d06880ae8d9d830ceb3e422eaf0 /test/core/src
parent58ff1482e3d6ac68aa76afd82995fd2ef5a17be6 (diff)
downloadlombok-a49aec582b129687cee7d2c87b586a20bceb0c43.tar.gz
lombok-a49aec582b129687cee7d2c87b586a20bceb0c43.tar.bz2
lombok-a49aec582b129687cee7d2c87b586a20bceb0c43.zip
[testing] `ant test.javac6` now passes. yay.
Diffstat (limited to 'test/core/src')
-rw-r--r--test/core/src/lombok/AbstractRunTests.java2
-rw-r--r--test/core/src/lombok/RunTestsViaDelombok.java8
2 files changed, 8 insertions, 2 deletions
diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java
index c3a16336..51ec41c5 100644
--- a/test/core/src/lombok/AbstractRunTests.java
+++ b/test/core/src/lombok/AbstractRunTests.java
@@ -92,7 +92,7 @@ public abstract class AbstractRunTests {
}
});
- boolean checkPositions = !(params instanceof TestLombokFilesIdempotent || params instanceof TestSourceFiles);
+ boolean checkPositions = !(params instanceof TestLombokFilesIdempotent || params instanceof TestSourceFiles) && !sourceDirectives_.isSkipCompareContent();
boolean changed = transformCode(messages, writer, file, sourceDirectives_.getSpecifiedEncoding(), sourceDirectives_.getFormatPreferences(), sourceDirectives_.minVersion(), checkPositions);
boolean forceUnchanged = sourceDirectives_.forceUnchanged() || sourceDirectives_.isSkipCompareContent();
diff --git a/test/core/src/lombok/RunTestsViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java
index 860c62d6..13acdf55 100644
--- a/test/core/src/lombok/RunTestsViaDelombok.java
+++ b/test/core/src/lombok/RunTestsViaDelombok.java
@@ -134,9 +134,15 @@ public class RunTestsViaDelombok extends AbstractRunTests {
// Given status of j6/j7, not worth properly testing.
check = false;
}
+ if (version < 8 && tree instanceof JCIdent) {
+ // explicit `super()` invocations do not appear to have end pos in j6/7.
+ if ("super".equals("" + ((JCIdent) tree).name)) check = false;
+ }
if (check && tree.pos == -1) fail(craftFailMsg("Start", astContext));
- if (check && Javac.getEndPosition(tree, unit) == -1) fail(craftFailMsg("End", astContext));
+ if (check && Javac.getEndPosition(tree, unit) == -1) {
+ fail(craftFailMsg("End", astContext));
+ }
} finally {
astContext.push(tree);
super.scan(tree);