[testing] ant test.javac6 now passes. yay.

This commit is contained in:
Reinier Zwitserloot committed 2021-03-14 03:48:05 +01:00
1 parent 58ff1482e3
commit a49aec582b
13 files changed
+20 -4

No files matched your search

+1 -1
View File
@@ -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();
@@ -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);
@@ -1,3 +1,4 @@
//version 8: springframework dep is too new to run on j6
import java.util.List;
class BuilderSingularNullBehavior2 {
private List<String> locations;
@@ -1,3 +1,4 @@
//version 8: springframework dep is too new to run on j6
public class NullLibrary2 {
String foo;
@java.lang.Override
@@ -1,3 +1,4 @@
// version 8: In java6/7, lub types worked differently, so, the `arraysAsList` method has a slightly different inferred type there.
import java.math.BigDecimal;
import java.util.*;
public class ValWeirdTypes<Z> {
@@ -1,3 +1,4 @@
//version 8: springframework dep is too new to run on j6
class WithPlain {
int i;
final int foo;
@@ -1,3 +1,4 @@
//version 8: springframework dep is too new to run on j6
import java.util.List;
import lombok.Singular;
@lombok.Builder class BuilderSingularNullBehavior2 {
@@ -1,4 +1,4 @@
//version 8:
//version 8: springframework dep is too new to run on j6
//CONF: lombok.addNullAnnotations = spring
//CONF: lombok.nonNull.exceptionType = JDK
import java.util.List;
@@ -1,3 +1,4 @@
//version 8: springframework dep is too new to run on j6
//CONF: lombok.addNullAnnotations = spring
@lombok.EqualsAndHashCode
@lombok.ToString
@@ -1,3 +1,4 @@
//version 8: Javac 6 will error out due to `ChildBuilder` not existing before properly running lombok. Giving j6 support status, not worth fixing.
import java.util.List;
public class SuperBuilderCustomized {
@@ -1,4 +1,5 @@
import java.util.List;
//version 8: Javac 6 will error out due to `ChildBuilder` not existing before properly running lombok. Giving j6 support status, not worth fixing.
iimport java.util.List;
public class SuperBuilderWithCustomBuilderMethod {
@lombok.experimental.SuperBuilder
@@ -1,3 +1,4 @@
// version 8: In java6/7, lub types worked differently, so, the `arraysAsList` method has a slightly different inferred type there.
import java.math.BigDecimal;
import java.util.*;
import lombok.val;
@@ -1,3 +1,4 @@
//version 8: springframework dep is too new to run on j6
//CONF: lombok.addNullAnnotations = spring
import lombok.With;
class WithPlain {